Merge "improved flow-type model"

diff --git a/opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/flow-types.yang b/opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/flow-types.yang
index ed92bf499a09061f86f43ff56ac358facdc77a22..cd364b5402425fe63cc7c35bb78fed79b6a519ac 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/flow-types.yang
+++ b/opendaylight/sal/yang-prototype/sal/model/model-flow-base/src/main/yang/flow-types.yang
@@ -76,6 +76,21 @@ module opendaylight-flow-types {
             }
             uses action;
         }
+        leaf priority {
+            type uint16;
+        }
+        
+        leaf idle-timeout {
+            type uint16;
+        }
+        
+        leaf hard-timeout {
+            type uint16;
+        }
+        
+        leaf cookie {
+            type uint64;
+        }
     }
 
     grouping flow-statistics {