Reorder openflowplugin features

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

diff --git a/features/ovsdb/src/main/features/features.xml b/features/ovsdb/src/main/features/features.xml
index 467c69f221081168d891578e06c36ec97ff175a6..d45ca792bcf2c112e9a854b25b0426b4aefb7260 100644 (file)
--- a/features/ovsdb/src/main/features/features.xml
+++ b/features/ovsdb/src/main/features/features.xml
@@ -80,10 +80,11 @@
   <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization"
            version='${openstack.netvirt.version}'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
-    <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${networkconfig.neutron.version}">odl-neutron-service</feature>
     <feature version="1.1.0-SNAPSHOT">odl-ovsdb-southbound-impl-ui</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
     <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/${openstack.netvirt.version}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${openstack.netvirt.providers.version}</bundle>

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/ConfigActivator.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/ConfigActivator.java
index 08f64c3bf4a04de5a9ae4899267a9a5201ab0d79..8d56e89d9e98975d1b2eae9c33b7272b5c676ff3 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/ConfigActivator.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/ConfigActivator.java
@@ -126,12 +126,13 @@ public class ConfigActivator implements BundleActivator {
     @Override
     public void stop(BundleContext context) throws Exception {
         LOG.info("ConfigActivator stop");
-        //NetworkingProviderManagerTracker.close();
+        /* ServiceTrackers and services are already released when bundle stops
+        NetworkingProviderManagerTracker.close();
         for (ServiceRegistration registration : registrations) {
             if (registration != null) {
                 registration.unregister();
             }
-        }
+        }*/
     }
 
     private ServiceRegistration<?> registerService(BundleContext bundleContext, String[] interfaces,

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java
index 2abbede8f9478bdc7511daa51f1de3fc73c38ea7..e726aa1b68526c7ffa11fd9d160a78af72563321 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java
@@ -416,18 +416,19 @@ public class ConfigActivator implements BundleActivator {
     @Override
     public void stop(BundleContext context) throws Exception {
         LOG.info("ConfigActivator stop");
-        /*INeutronNetworkCRUDTracker.close();
+        /* ServiceTrackers and services are already released when bundle stops
+        INeutronNetworkCRUDTracker.close();
         INeutronPortCRUDTracker.close();
         INeutronSubnetCRUDTracker.close();
         INeutronLoadBalancerCRUDTracker.close();
         INeutronLoadBalancerPoolCRUDTracker.close();
         LoadBalancerProviderTracker.close();
-        */
+
         for (ServiceRegistration registration : registrations) {
             if (registration != null) {
                 registration.unregister();
             }
-        }
+        }*/
     }
 
     private ServiceRegistration<?> registerService(BundleContext bundleContext, String[] interfaces,