Fixed Group and Meter RPC model to use MD-SAL routing correctly

[controller.git] / opendaylight / md-sal / model / model-flow-service / src / main / yang / group-service.yang

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
index d8231e9126fe3dbbc67d63a14fbdcb7ab6ec8ef5..9106bca8a4826619f09062a3c3322b16e3551621 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
@@ -2,25 +2,25 @@ module sal-group {
     namespace "urn:opendaylight:group:service";
     prefix group;
 
-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import opendaylight-group-types {prefix group-type;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import ietf-inet-types {prefix inet;revision-date 2010-09-24;}
+    import opendaylight-group-types {prefix group-type;revision-date 2013-10-18;}
+    import flow-capable-transaction {prefix tr;}
 
     revision "2013-09-18" {
         description "Initial revision of group service";
     }        
     
     grouping node-group {
-        leaf node {
-            ext:context-reference "inv:node-context";
-            type inv:node-ref;
-        }
+        uses "inv:node-context-ref";        
         uses group-type:group;
     }
 
     /** Base configuration structure **/
     grouping group-update {
+        uses "inv:node-context-ref";
+        
         container original-group {
             uses group-type:group;
         }
@@ -32,26 +32,30 @@ module sal-group {
     rpc add-group {
         input {
             uses node-group;
+            uses tr:transaction-aware;
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc remove-group {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
-            uses group-update;
+            uses node-group;
+            uses tr:transaction-aware;
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc update-group {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
             uses group-update;
+            uses tr:transaction-aware;
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }