Flow removed switch event. Group and Meter update RPC

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

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
index eee233f3d6dd6f86fbff7b164f4639d28b17b7a5..685728a88709cac4396294e375f22943113de17c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
@@ -2,16 +2,16 @@ module opendaylight-group-types {
     namespace "urn:opendaylight:group:types";
     prefix group;
 
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-flow-types {prefix flow-types;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
+    import opendaylight-action-types {prefix action;}
 
-    revision "2013-09-18" {
+    revision "2013-10-18" {
         description "Initial revision of group service";
     }
 
-    typedef group-ref {
-        type instance-identifier;
+    typedef group-id {
+        type uint32;
     }
     
     grouping group-types {
@@ -30,9 +30,25 @@ module opendaylight-group-types {
         uses group-types;
         
         leaf group-id {
-            type group-ref;
+            type group-id;
         }
         
+        leaf group-name {
+            type string;
+        }
+        
+        leaf container-name {
+            type string; 
+        }
+        
+        leaf install {
+            type boolean; 
+        } 
+        
+        leaf barrier {
+            type boolean; 
+        }       
+        
         container buckets {
             list bucket {
                 key "order";
@@ -52,16 +68,7 @@ module opendaylight-group-types {
                     type uint32;
                 }
                 
-                container actions {
-                    list action {
-                        key "action-order";
-                        leaf action-order {
-                            type int32;
-                        }
-            
-                        uses flow-types:action;
-                    }
-                }
+                uses action:action-list;
             }
         }
     }
@@ -152,6 +159,7 @@ module opendaylight-group-types {
             }
             
             uses group-types;
+            
             leaf capabilities { 
                 type enumeration {
                     enum select-weight;