Merge "Bug 1073: Implemented Transaction chain on InMemoryDOMDataStore level."

[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 6e87cc6f1c5642530c7175bcc7774da93824317e..0d8a0b6f549c1d9583d54386d045cb9bd4b83468 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,8 +11,49 @@ 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 {
+                value 1;
+            }
+            enum IN_PORT {
+                value 2;
+            }
+            enum TABLE {
+                value 3;
+            }
+            enum NORMAL {
+                value 4;
+            }
+            enum FLOOD {
+                value 5;
+            }
+            enum ALL {
+                value 6;
+            }
+            enum CONTROLLER {
+                value 7;
+            }
+            enum LOCAL {
+                value 8;
+            }
+            enum ANY {
+                value 9;
+            }
+            enum NONE {
+                value 10;
+            }
+
+        }
     }
     grouping instruction-list {
         list instruction {
@@ -108,7 +148,7 @@ module opendaylight-flow-types {
         }
         
         leaf cookie {
-            type uint64;
+            type flow-cookie;
         }
         
         leaf table_id {
@@ -132,7 +172,7 @@ module opendaylight-flow-types {
         }
         
         leaf cookie_mask {
-            type uint64;
+            type flow-cookie;
         }
         
         leaf buffer_id {
@@ -230,4 +270,4 @@ module opendaylight-flow-types {
             uses match:match;
         }
     }
-}
\ No newline at end of file
+}