Fixed discard-changes for mdsal netconf, mapping code cleanup.

[controller.git] / opendaylight / md-sal / model / model-flow-base / src / main / yang / opendaylight-flow-types.yang

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
index f8d5a4e2bd19dace95d10f8f8e034d1fb1109b3a..5c97e1444f6e56d4fba0652e501513ff5f58ef98 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
@@ -2,7 +2,6 @@ module opendaylight-flow-types {
     namespace "urn:opendaylight:flow:types";
     prefix flow;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}    
     import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action;}
@@ -12,9 +11,15 @@ module opendaylight-flow-types {
         description "Initial revision of flow service";
     }
     
-    typedef table-id {
-       type uint8;
+    typedef flow-ref {
+        type instance-identifier;
     }
+    
+    typedef flow-cookie {
+        description "openflow specific type - flow cookie / flow cookie mask";
+        type uint64;
+    }
+    
     typedef output-port-values {
         type enumeration {
             enum MAX {
@@ -53,9 +58,7 @@ module opendaylight-flow-types {
     grouping instruction-list {
         list instruction {
             key "order";
-            leaf order {
-                type int32;
-            }
+            uses action:ordered;
             uses instruction;
         }
     }
@@ -143,7 +146,7 @@ module opendaylight-flow-types {
         }
         
         leaf cookie {
-            type uint64;
+            type flow-cookie;
         }
         
         leaf table_id {
@@ -167,7 +170,7 @@ module opendaylight-flow-types {
         }
         
         leaf cookie_mask {
-            type uint64;
+            type flow-cookie;
         }
         
         leaf buffer_id {