Merge "Cleanup features.xml files" into topic/netvirtsb

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
index 6285e822d59ed32b9ab23f7cf276169431725353..8e943b9f78d3efc5442ec2b8234f50f326cdb8eb 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
@@ -62,7 +62,6 @@ public class Activator extends DependencyActivatorBase {
                 .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true))
                 .add(createServiceDependency().setService(ClassifierProvider.class).setRequired(true))
                 .add(createServiceDependency().setService(IngressAclProvider.class).setRequired(true))
@@ -98,7 +97,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), ArpProvider.class.getName()},
                         props3)
                 .setImplementation(ArpResponderService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -110,7 +108,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(),
                         InboundNatProvider.class.getName()}, props4)
                 .setImplementation(InboundNatService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -122,7 +119,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), IngressAclProvider.class.getName()},
                         props5)
                 .setImplementation(IngressAclService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -134,7 +130,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[] {AbstractServiceInstance.class.getName(),
                                 LoadBalancerProvider.class.getName()}, props6)
                 .setImplementation(LoadBalancerService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -146,7 +141,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[] {AbstractServiceInstance.class.getName(), RoutingProvider.class.getName()},
                         props7)
                 .setImplementation(RoutingService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -158,7 +152,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[] {AbstractServiceInstance.class.getName(),
                                 L3ForwardingProvider.class.getName()}, props8)
                 .setImplementation(L3ForwardingService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -169,7 +162,6 @@ public class Activator extends DependencyActivatorBase {
         manager.add(createComponent()
                 .setInterface(AbstractServiceInstance.class.getName(), props9)
                 .setImplementation(L2RewriteService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -182,7 +174,6 @@ public class Activator extends DependencyActivatorBase {
                                 L2ForwardingProvider.class.getName()},
                         props10)
                 .setImplementation(L2ForwardingService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -194,7 +185,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), EgressAclProvider.class.getName()},
                         props11)
                 .setImplementation(EgressAclService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -206,7 +196,6 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(),
                         OutboundNatProvider.class.getName()}, props12)
                 .setImplementation(OutboundNatService.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
     }

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
index fd0034995f440f92dea389d560051a9f09ca3a9d..c3b0ad21e600c0f77bfa6ef1ab3fbf944d7f2c69 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java
@@ -1117,10 +1117,13 @@ public class OF13Provider implements NetworkingProvider {
                                 + intf.getName() + " on srcNode " + srcNode.getNodeId().getValue());
                         removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
                                 dst, srcNode, intf, true, isLastInstanceOnNode);
-                        logger.info("Remove tunnel rules for interface "
-                                + intf.getName() + " on dstNode " + dstNode.getNodeId().getValue());
-                        removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
-                                src, dstNode, intf, false, isLastInstanceOnNode);
+                        Node dstBridgeNode = MdsalUtils.getBridgeNode(dstNode, Constants.INTEGRATION_BRIDGE);
+                        if(dstBridgeNode != null){
+                            logger.info("Remove tunnel rules for interface "
+                                    + intf.getName() + " on dstNode " + dstNode.getNodeId().getValue());
+                            removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
+                                    src, dstBridgeNode, intf, false, isLastInstanceOnNode);
+                        }
                     } else {
                         logger.warn("Tunnel end-point configuration missing. Please configure it in "
                                 + "OpenVSwitch Table. "

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
index 7c03f3baae4d72746a3004fa1f08cf849814304a..f4284cee7ef3d9757d10c6720e57b9654aa5349e 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
@@ -48,7 +48,6 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheListener;
 import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.OutboundNatProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.RoutingProvider;
@@ -119,7 +118,7 @@ public class Activator extends DependencyActivatorBase {
                 .setImplementation(NetworkHandler.class)
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(NodeCacheManager.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
                 .add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true)));
@@ -141,7 +140,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{INeutronPortAware.class.getName(), AbstractHandler.class.getName()},
                         portHandlerProperties)
                 .setImplementation(PortHandler.class)
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(NodeCacheManager.class).setRequired(true))
                 .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
                 .add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true)));
 
@@ -168,7 +167,6 @@ public class Activator extends DependencyActivatorBase {
                 .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(NetworkingProviderManager.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
                 .add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbInventoryService.class).setRequired(true))
@@ -269,7 +267,7 @@ public class Activator extends DependencyActivatorBase {
                 .setImplementation(NeutronL3Adapter.class)
                 .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(NodeCacheManager.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronSubnetCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
@@ -294,8 +292,7 @@ public class Activator extends DependencyActivatorBase {
                         .setCallbacks("cacheListenerAdded", "cacheListenerRemoved")));
 
         manager.add(createComponent()
-                .setInterface(new String[] {OvsdbConnectionService.class.getName(),
-                        OvsdbInventoryService.class.getName()}, null)
+                .setInterface(new String[] {OvsdbInventoryService.class.getName()}, null)
                 .setImplementation(OvsdbInventoryServiceImpl.class)
                 .add(createServiceDependency().setService(OvsdbInventoryListener.class)
                         .setCallbacks("listenerAdded", "listenerRemoved"))

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 b6f0a14d38b3a197344978accbb8361cbcf7b34b..d4129190c86dde6c397caa406e94644da85d028a 100644 (file)
--- 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
@@ -697,6 +697,12 @@ public class MdsalUtils {
     }
 
     public static boolean isTunnel(OvsdbTerminationPointAugmentation port) {
+        LOG.trace("MdsalUtils#isTunnel: Interface : {}", port);
+
+        if(port.getInterfaceType() == null){
+            LOG.warn("No type found for the interface : {}", port);
+            return false;
+        }
         return MdsalHelper.createOvsdbInterfaceType(
                 port.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN)
                 || MdsalHelper.createOvsdbInterfaceType(

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
index b8a1fce71e57919c8d52ea7ca5155b1fa7aeafd1..df2b814af84e0470426ed7585602229bab95b6e8 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
@@ -14,12 +14,11 @@ import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
 import org.opendaylight.neutron.spi.NeutronNetwork;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
 import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +44,7 @@ public class NetworkHandler extends AbstractHandler
     private volatile TenantNetworkManager tenantNetworkManager;
     private volatile BridgeConfigurationManager bridgeConfigurationManager;
     /* TODO SB_MIGRATION */
-    private volatile OvsdbConnectionService connectionService;
+    private volatile NodeCacheManager nodeCacheManager;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
     private volatile NeutronL3Adapter neutronL3Adapter;
 
@@ -143,7 +142,7 @@ public class NetworkHandler extends AbstractHandler
             networks = neutronNetworkCache.getAllNetworks();
             if (networks.isEmpty()) {
                 logger.trace("neutronNetworkDeleted: last tenant network, delete tunnel ports...");
-                List<Node> nodes = connectionService.getNodes();
+                List<Node> nodes = nodeCacheManager.getNodes();
 
                 for (Node node : nodes) {
                     List<String> phyIfName = bridgeConfigurationManager.getAllPhysicalInterfaceNames(node);

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 5059df0cf3a24bdf48512ef89fcef8f7e9cc4ddb..03da13150a7abd8a01affa59cb69b72c0e8c3326 100644 (file)
--- 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
@@ -13,11 +13,10 @@ import org.opendaylight.neutron.spi.INeutronPortAware;
 import org.opendaylight.neutron.spi.NeutronPort;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +30,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware {
     static final Logger logger = LoggerFactory.getLogger(PortHandler.class);
 
     // The implementation for each of these services is resolved by the OSGi Service Manager
-    private volatile OvsdbConnectionService connectionService;
+    private volatile NodeCacheManager nodeCacheManager;
     private volatile NeutronL3Adapter neutronL3Adapter;
 
     /**
@@ -118,7 +117,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware {
         logger.debug("Handling neutron delete port " + neutronPort);
         neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.DELETE);
         //TODO: Need to implement getNodes
-        List<Node> nodes = connectionService.getNodes();
+        List<Node> nodes = nodeCacheManager.getNodes();
         for (Node node : nodes) {
             try {
                 List<OvsdbTerminationPointAugmentation> ports = MdsalUtils.getTerminationPointsOfBridge(node);

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java
index 429be4f1ce3f59f6c04a1df26c8b24ba1a0c84e4..6142fcf2d082129b8291b0ed165759edef335ca0 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java
@@ -36,7 +36,6 @@ public class SouthboundHandler extends AbstractHandler
     private volatile BridgeConfigurationManager bridgeConfigurationManager;
     private volatile TenantNetworkManager tenantNetworkManager;
     private volatile NetworkingProviderManager networkingProviderManager;
-    private volatile OvsdbConnectionService connectionService;
     private volatile NeutronL3Adapter neutronL3Adapter;
     private volatile NodeCacheManager nodeCacheManager = null;
 
@@ -187,7 +186,12 @@ public class SouthboundHandler extends AbstractHandler
     }
 
     private boolean isInterfaceOfInterest(OvsdbTerminationPointAugmentation terminationPoint, List<String> phyIfName) {
-        logger.warn("isInterfaceOfInterest: getInterfaceType: {}", terminationPoint.getInterfaceType());
+        logger.trace("SouthboundHandler#isInterfaceOfInterest: Interface : {}", terminationPoint);
+
+        if(terminationPoint.getInterfaceType() == null){
+            logger.warn("No type found for the interface : {}", terminationPoint);
+            return false;
+        }
         return (MdsalHelper.createOvsdbInterfaceType(
                 terminationPoint.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN)
                 ||

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java
deleted file mode 100644 (file)
index 739676b..0000000
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/OvsdbConnectionService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.opendaylight.ovsdb.openstack.netvirt.api;
-
-import java.util.List;
-import java.util.Map;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
-/**
- * Created by shague on 4/20/15.
- */
-public interface OvsdbConnectionService {
-    public List<Node> getNodes();
-    public List<Node> getOvsdbNodes();
-    public List<Node> getBridgeNodes();
-    public Node getNode(String identifier);
-}

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
index cf13cabf638bcdd46d1492264e0e0dfd9c347b54..208fe6959fa8431066c95126d5bc60295cbebadc 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
@@ -53,7 +53,7 @@ public class NeutronL3Adapter {
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile ConfigurationService configurationService;
     private volatile TenantNetworkManager tenantNetworkManager;
-    private volatile OvsdbConnectionService connectionService;
+    private volatile NodeCacheManager nodeCacheManager;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
     private volatile INeutronSubnetCRUD neutronSubnetCache;
     private volatile INeutronPortCRUD neutronPortCache;
@@ -247,12 +247,16 @@ public class NeutronL3Adapter {
         }
 
         final Action action = isDelete ? Action.DELETE : Action.ADD;
-        List<Node> nodes = connectionService.getBridgeNodes();
+        List<Node> nodes = nodeCacheManager.getBridgeNodes();
         if (nodes.isEmpty()) {
             logger.trace("updateL3ForNeutronPort has no nodes to work with");
         }
         for (Node node : nodes) {
-            final Long dpid = getDpid(node);
+            final Long dpid = getDpidForIntegrationBridge(node);
+            if (dpid == null) {
+                continue;
+            }
+
             final boolean tenantNetworkPresentInNode =
                     tenantNetworkManager.isTenantNetworkPresentInNode(node, providerSegmentationId);
             for (Neutron_IPs neutronIP : neutronPort.getFixedIPs()) {
@@ -370,12 +374,16 @@ public class NeutronL3Adapter {
             subnetIdToRouterInterfaceCache.put(subnet.getSubnetUUID(), destNeutronRouterInterface);
         }
 
-        List<Node> nodes = connectionService.getBridgeNodes();
+        List<Node> nodes = nodeCacheManager.getBridgeNodes();
         if (nodes.isEmpty()) {
             logger.trace("programFlowsForNeutronRouterInterface has no nodes to work with");
         }
         for (Node node : nodes) {
-            final Long dpid = getDpid(node);
+            final Long dpid = getDpidForIntegrationBridge(node);
+            if (dpid == null) {
+                continue;
+            }
+
             final Action actionForNode =
                     tenantNetworkManager.isTenantNetworkPresentInNode(node, destinationSegmentationId) ?
                     action : Action.DELETE;
@@ -801,12 +809,16 @@ public class NeutronL3Adapter {
         }
 
         final Action action = isDelete ? Action.DELETE : Action.ADD;
-        List<Node> nodes = connectionService.getBridgeNodes();
+        List<Node> nodes = nodeCacheManager.getBridgeNodes();
         if (nodes.isEmpty()) {
             logger.trace("programFlowsForFloatingIP has no nodes to work with");
         }
         for (Node node : nodes) {
-            final Long dpid = getDpid(node);
+            final Long dpid = getDpidForIntegrationBridge(node);
+            if (dpid == null) {
+                continue;
+            }
+
             final Action actionForNode =
                     tenantNetworkManager.isTenantNetworkPresentInNode(node, providerSegmentationId) ?
                     action : Action.DELETE;
@@ -925,10 +937,11 @@ public class NeutronL3Adapter {
         return result;
     }
 
-    private Long getDpid(Node node) {
-        /* TODO SB_MIGRATION */
-        // may need to go from OvsdbNode to BridgeNode
-        // get integration bridge on this node and then get dpid
-        return MdsalUtils.getDataPathId(node);
+    private Long getDpidForIntegrationBridge(Node node) {
+        // Check if node is integration bridge; and only then return its dpid
+        if (MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName()) != null) {
+            return MdsalUtils.getDataPathId(node);
+        }
+        return null;
     }
 }

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java
index 7b5488dfe6d7587c2586c08b6fa46cf68a4dc931..509b221e1abba7f249cf07fdb0c67dfbd229b3af 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java
@@ -17,7 +17,6 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
 import org.opendaylight.ovsdb.openstack.netvirt.MdsalUtils;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
@@ -30,8 +29,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Sam Hague (shague@redhat.com)
  */
-public class OvsdbInventoryServiceImpl implements BindingAwareConsumer,
-        OvsdbConnectionService, OvsdbInventoryService {
+public class OvsdbInventoryServiceImpl implements BindingAwareConsumer, OvsdbInventoryService {
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbInventoryServiceImpl.class);
     private static DataBroker dataBroker = null;
 
@@ -99,24 +97,4 @@ public class OvsdbInventoryServiceImpl implements BindingAwareConsumer,
     public static Set<OvsdbInventoryListener> getMdsalConsumerListeners () {
         return mdsalConsumerListeners;
     }
-
-    @Override
-    public List<Node> getNodes() {
-        return null;
-    }
-
-    @Override
-    public List<Node> getOvsdbNodes() {
-        return null;
-    }
-
-    @Override
-    public List<Node> getBridgeNodes() {
-        return null;
-    }
-
-    @Override
-    public Node getNode(String identifier) {
-        return null;
-    }
 }