Merge "Conductor RPC registration moved"

diff --git a/applications/features/pom.xml b/applications/features/pom.xml
index 864bacd565306ab340db041223edce33bd1d1e72..0d58d5a7ee51ec66aeb1d584da9542a18b8beeda 100644 (file)
--- a/applications/features/pom.xml
+++ b/applications/features/pom.xml
@@ -79,13 +79,6 @@
       <type>xml</type>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.applications</groupId>
-      <artifactId>statistics-manager-config</artifactId>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>

diff --git a/applications/features/src/main/features/features.xml b/applications/features/src/main/features/features.xml
index e73e62689340199dd88b97800dae3d3ac4ab9599..4954d337a36e53096900424bf6d74a6ac85b6407 100644 (file)
--- a/applications/features/src/main/features/features.xml
+++ b/applications/features/src/main/features/features.xml
@@ -22,7 +22,6 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/forwardingrules-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
 </features>

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
index b85fe411b848581c517ed9628cd4596a031e8c56..6c43cd4912f64f43aed34ad0af79cf54839f288a 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
@@ -152,16 +152,16 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
 
             switch (mod.getModificationType()) {
                 case DELETE:
-                    remove(key, mod.getDataBefore(), nodeIdent);
+                    if (mod.getDataAfter() == null) {
+                        remove(key, mod.getDataBefore(), nodeIdent);
+                    }
                     break;
                 case SUBTREE_MODIFIED:
-                    update(key, mod.getDataBefore(), mod.getDataAfter(), nodeIdent);
+                    //NO-OP since we donot need to reconciliate on Node-updated
                     break;
                 case WRITE:
                     if (mod.getDataBefore() == null) {
                         add(key, mod.getDataAfter(), nodeIdent);
-                    } else {
-                        update(key, mod.getDataBefore(), mod.getDataAfter(), nodeIdent);
                     }
                     break;
                 default:
@@ -184,20 +184,6 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
         }
     }
 
-
-    public void update(InstanceIdentifier<FlowCapableNode> identifier,
-                       FlowCapableNode original, FlowCapableNode update, InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE)){
-            LOG.warn("Node updated: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
-            //donot need to do anything as we are not considering updates here
-            if (!nodeIdent.isWildcarded()) {
-                // then force registration to local node cache and reconcile
-                flowNodeConnected(nodeIdent, true);
-            }
-        }
-    }
-
-
     public void add(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode add,
                     InstanceIdentifier<FlowCapableNode> nodeIdent) {
         if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE)){

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 82ba5748cd3fd274858de4c74b926e872d333e22..9fa056f00b5cd0803b15ebff5de53546c25cf994 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -81,13 +81,6 @@
                 <artifactId>forwardingrules-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>forwardingrules-manager-config</artifactId>
-                <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>forwardingrules-sync</artifactId>
@@ -105,13 +98,6 @@
                 <artifactId>inventory-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>inventory-manager</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>lldp-speaker</artifactId>
@@ -132,25 +118,11 @@
                 <artifactId>topology-lldp-discovery</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>topology-lldp-discovery</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>topology-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>topology-manager</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>of-switch-config-pusher</artifactId>
@@ -178,20 +150,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>of-switch-config-pusher</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>statistics-manager-config</artifactId>
-                <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>table-miss-enforcer</artifactId>
@@ -199,13 +157,6 @@
                 <type>xml</type>
                 <classifier>config</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>lldp-speaker</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>openflowplugin-controller-config</artifactId>

diff --git a/features-li/pom.xml b/features-li/pom.xml
index efa947a51a2d12ebb0b554a695f2c1dbd3cad283..acfdf568d386aa3fa3768654247d3bf83c1e2486 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -162,12 +162,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>statistics-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>statistics-manager-config</artifactId>
-            <classifier>config</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-blueprint-config</artifactId>