From 938d130525543760d1efdc764b7c80fa412e88aa Mon Sep 17 00:00:00 2001
From: Kamal Rameshan <kramesha@cisco.com>
Date: Thu, 7 Aug 2014 20:50:54 -0700
Subject: [PATCH] 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>
---
 .../src/main/yang/opendaylight-action-types.yang       | 10 +++++++---
 .../src/main/yang/opendaylight-flow-types.yang         |  4 +---
 .../src/main/yang/opendaylight-table-types.yang        |  4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

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 fdc8d02e17..041fc576a1 100644
--- 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 0d8a0b6f54..5c97e1444f 100644
--- 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 393f6db9fe..91224ef93e 100644
--- 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;
                 }
             }
-- 
2.36.6