Reenable neutron I*Aware services

Change-Id: I322a25efbff708327204c6264423f6848f4fb56f
Signed-off-by: Sam Hague <shague@redhat.com>

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 180e82fe2158603f3db6dc41ee9548c5e85f3232..6285e822d59ed32b9ab23f7cf276169431725353 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
@@ -61,8 +61,8 @@ public class Activator extends DependencyActivatorBase {
                 .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .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(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))

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 0599b917546ea97506bcdd360e5f44f7b8df2d83..532059fe769f582d36cdb1ee1dd0602b07a41ca6 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
@@ -90,8 +90,8 @@ public class Activator extends DependencyActivatorBase {
         manager.add(createComponent()
                 .setInterface(TenantNetworkManager.class.getName(), null)
                 .setImplementation(TenantNetworkManagerImpl.class)
-                //.add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
-                //.add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
+                .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
+                .add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(VlanConfigurationCache.class)));
 
         manager.add(createComponent()
@@ -270,9 +270,9 @@ public class Activator extends DependencyActivatorBase {
                 .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
-                //.add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
-                //.add(createServiceDependency().setService(INeutronSubnetCRUD.class).setRequired(true))
-                //.add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
+                .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
+                .add(createServiceDependency().setService(INeutronSubnetCRUD.class).setRequired(true))
+                .add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(ArpProvider.class).setRequired(false))
                 .add(createServiceDependency().setService(InboundNatProvider.class).setRequired(false))
                 .add(createServiceDependency().setService(OutboundNatProvider.class).setRequired(false))

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 0102acc9b5e66170f538ad09b8f7867c83761672..cf13cabf638bcdd46d1492264e0e0dfd9c347b54 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
@@ -76,6 +76,7 @@ public class NeutronL3Adapter {
     private Boolean enabled = false;
 
     void init() {
+        logger.info(">>>>>> init {}", this.getClass());
         final String enabledPropertyStr = ConfigProperties.getProperty(this.getClass(), "ovsdb.l3.fwd.enabled");
         if (enabledPropertyStr != null && enabledPropertyStr.equalsIgnoreCase("yes")) {
             this.inboundIpRewriteCache = new HashSet<>();

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
index 4a54e585633806cd012d6296d39cabef8bac1d5b..da0763b13d54ae9aca6b3c8b787ed12068bb40ba 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
@@ -17,7 +17,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.MdsalUtils;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
-import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
+//import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
 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;
 
@@ -107,8 +107,8 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager {
     @Override
     public NeutronNetwork getTenantNetwork(OvsdbTerminationPointAugmentation terminationPointAugmentation) {
         NeutronNetwork neutronNetwork = null;
-        neutronPortCache = (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
-        neutronNetworkCache = (INeutronNetworkCRUD) ServiceHelper.getGlobalInstance(INeutronNetworkCRUD.class, this);
+        //neutronPortCache = (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
+        //neutronNetworkCache = (INeutronNetworkCRUD) ServiceHelper.getGlobalInstance(INeutronNetworkCRUD.class, this);
         if (neutronPortCache == null || neutronNetworkCache == null) {
             logger.error("neutron interfaces are null");
             return neutronNetwork;
@@ -136,7 +136,7 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager {
     @Override
     public NeutronPort getTenantPort(OvsdbTerminationPointAugmentation terminationPointAugmentation) {
         NeutronPort neutronPort = null;
-        neutronPortCache = (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
+        //neutronPortCache = (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
         if (neutronPortCache == null) {
             logger.error("neutron port is null");
             return neutronPort;