From 54f3f12c74b5539c92018125d6fd450b60be06af Mon Sep 17 00:00:00 2001 From: Anil Vishnoi Date: Wed, 13 May 2015 19:04:53 +0530 Subject: [PATCH] Fixes bridge name comparison in isNodeTunnelReady Change-Id: I6fecda39ea79a522651f2240b19fbe718c51c796 Signed-off-by: Anil Vishnoi --- .../org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java | 2 +- .../org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java index bac1184ae..b89c8e22c 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java @@ -349,7 +349,7 @@ public class MdsalUtils { public static OvsdbBridgeAugmentation getBridge(Node node, String name) { OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); if (bridge != null) { - if (!bridge.getBridgeName().equals(name)) { + if (!bridge.getBridgeName().getValue().equals(name)) { bridge = null; } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java index 0ecf8e29f..5059df0cf 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java @@ -117,7 +117,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware { private void doNeutronPortDeleted(NeutronPort neutronPort) { logger.debug("Handling neutron delete port " + neutronPort); neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.DELETE); - + //TODO: Need to implement getNodes List nodes = connectionService.getNodes(); for (Node node : nodes) { try { -- 2.36.6