Merge "Bug 1088 - flow id in operational not matched; after removal not removed compl...

diff --git a/features/nsf/pom.xml b/features/nsf/pom.xml
index 5be411caae22212330ad5ba1104f2a66067dbae1..875ca2ca617d26b9246f6eda27914daa9c87d358 100644 (file)
--- a/features/nsf/pom.xml
+++ b/features/nsf/pom.xml
@@ -28,6 +28,21 @@
       <version>1.4.2-SNAPSHOT</version>
       <type>zip</type>
     </dependency>
+    <!-- Feature Dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-adsal</artifactId>
+      <version>${sal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-base</artifactId>
+      <classifier>features</classifier>
+      <version>${commons.opendaylight.version}</version>
+      <type>xml</type>
+    </dependency>
     <!-- Bundle Dependencies -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
index 64c3d9c467bdeeae7726f4f462ab54a75f5e7775..5a40022963f9b35520cc47148e0d777f5693c7b7 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
@@ -204,15 +204,6 @@ module flow-node-inventory {
         }
     }
 
-    rpc get-node-ip-address {
-        input {
-            uses "inv:node-context-ref";
-        }
-        output {
-            uses ip-address-grouping;
-        }
-    }
-
     grouping flow-node-connector {
 
         uses port:flow-capable-port;