X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-service%2Fsrc%2Fmain%2Fyang%2Fgroup-service.yang;h=6cc1537ebc11c5d8f05a5921badbe79c300c8a12;hb=454f93d530edea269105cebd0020d0bf1aa75c79;hp=3c6287f879506959dc9141bc6f7542dc1ca2916a;hpb=7a59fdccdf3fcb38fdf26d590040b8ce2a5fe03b;p=controller.git

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 3c6287f879..6cc1537ebc 100644
--- 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;
         }
@@ -31,23 +31,64 @@ module sal-group {
 
     rpc add-group {
         input {
+            leaf group-ref {
+                type group-type:group-ref;
+            }
             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;
+            leaf group-ref {
+                type group-type:group-ref;
             }
-            uses group-update;
+            uses node-group;
+            uses tr:transaction-aware;
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc update-group {
         input {
+            leaf group-ref {
+                type group-type:group-ref;
+            }
             uses group-update;
+            uses tr:transaction-aware;
+        }
+        output {
+            uses tr:transaction-aware;
+        }
+    } 
+
+    notification group-added {
+        leaf group-ref {
+            type group-type:group-ref;
+        }
+        uses node-group;
+        uses tr:transaction-aware;
+    }
+
+    notification group-updated {
+        leaf group-ref {
+            type group-type:group-ref;
+        }
+        uses node-group;
+        uses tr:transaction-aware;
+    }
+
+    notification group-removed {
+        leaf group-ref {
+            type group-type:group-ref;
         }
-    }     
+        uses node-group;
+        uses tr:transaction-aware;
+    }    
 }
\ No newline at end of file