Bug-1338: Create a grouping for order to help create generic OrderComparator in OFP

Change-Id: I1a2a2df249b244081e45097afbc41c71e6ff2f76
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
index fdc8d02e176d52201ea7022a559de2eada25512b..041fc576a112582c5804ec126ddd2067dda69895 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
@@ -33,13 +33,17 @@ module opendaylight-action-types {
     container action-types {   
        uses action-list;
     }
+
+    grouping ordered {
+        leaf order {
+          type int32;
+        }
+    }
     
     grouping action-list {
         list action {
             key "order";
-            leaf order {
-                type int32;
-            }
+            uses ordered;
             uses action;
         }
     }

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 0d8a0b6f549c1d9583d54386d045cb9bd4b83468..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
@@ -58,9 +58,7 @@ module opendaylight-flow-types {
     grouping instruction-list {
         list instruction {
             key "order";
-            leaf order {
-                type int32;
-            }
+            uses action:ordered;
             uses instruction;
         }
     }

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
index 393f6db9febbc0970b36c3dca1d8bf4d24ae674d..91224ef93e88e5d59b2765a9aefe1328ddc0f43b 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
@@ -343,9 +343,7 @@ module opendaylight-table-types {
             container table-properties {
                 list table-feature-properties {
                      key "order";
-                     leaf order {
-                         type int32;
-                     }
+                     uses action:ordered;
                      uses table-feature-prop-type;
                 }
             }