Merge "Migrate netconf testtool to work with karaf distribution"

[controller.git] / opendaylight / md-sal / model / model-flow-service / src / main / yang / flow-node-inventory.yang

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..fc0eb4cf7220c7428a9977f9eb0232e60750f045 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;
@@ -245,13 +236,17 @@ module flow-node-inventory {
     }
 
     augment "/inv:nodes/inv:node/table" {
-        ext:augment-identifier "flow-cookie-mapping";
-        list flow-cookie-map {
-            key "cookie";
-            leaf cookie {
-                type flow:flow-cookie;
+        ext:augment-identifier "flow-hash-id-mapping";
+    description "Flow is identified by match and priority on device. So Operational/DS
+        has to simulate that behavior and contract between FlowId and match+priority
+        identification should represent Flow hashCode. Flow has to contain only
+        match priority and flowCookie for create a hashCode";
+        list flow-hash-id-map {
+            key "hash";
+            leaf hash {
+                type string;
             }
-            leaf-list flow-ids {
+            leaf flow-id {
                 type flow-id;
             }
         }