Merge "Modify the java-client to use the build-helper-maven-plugin"

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

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
index d589f45332fbc096f189a085eb236e7c2bb30f8e..c1740d8abd27fa04c38fc88670cc755501adff65 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
@@ -10,6 +10,54 @@ module opendaylight-group-statistics {
     revision "2013-11-11" {
         description "Initial revision of group statistics service";
     }
+    
+    typedef group-stats-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-stats-response {
+        uses "inv:node-context-ref";
+
+        list group-statistics{
+               uses group-types:group-statistics;
+        }
+    }
+
+    typedef group-features-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-features-response {
+        uses "inv:node-context-ref";
+
+        uses group-types:group-features;
+    }
+
+    typedef group-desc-ref {
+        type instance-identifier;
+    }
+    
+    grouping group-desc-response {
+        uses "inv:node-context-ref";
+
+        list group-desc-stats {
+               uses group-types:group-desc-stats;
+        }
+    }
+    
+    container group-all-statistics {
+       container group-stats {
+               uses group-stats-response;
+       }
+       
+       container group-features {
+                       uses group-features-response;
+               }
+               
+               container group-desc {
+                       uses group-desc-response;
+               }
+    }
 
        // RPC calls
        rpc get-all-group-statistics {
@@ -17,9 +65,7 @@ module opendaylight-group-statistics {
             uses inv:node-context-ref;
         }
         output {
-            list group-statistics {
-                uses group-types:group-statistics;
-            }
+               uses group-stats-response;
             uses tr:transaction-aware;
         }
        
@@ -33,7 +79,7 @@ module opendaylight-group-statistics {
             }
         }
         output {
-            uses group-types:group-statistics;
+            uses group-stats-response;
             uses tr:transaction-aware;
         }
        
@@ -42,12 +88,9 @@ module opendaylight-group-statistics {
        rpc get-group-description {
                input {
             uses inv:node-context-ref;
-            leaf group-id{
-               type group-types:group-id;
-            }
         }
         output {
-               uses group-types:group-desc-stats;
+            uses group-desc-response;
             uses tr:transaction-aware;
         }
        }
@@ -55,12 +98,9 @@ module opendaylight-group-statistics {
        rpc get-group-features {
                input {
             uses inv:node-context-ref;
-            leaf group-id{
-               type group-types:group-id;
-            }
         }
         output {
-               uses group-types:group-features;
+            uses group-features-response;
             uses tr:transaction-aware;
         }
        }
@@ -69,17 +109,29 @@ module opendaylight-group-statistics {
        //Notification calls
        
        notification group-statistics-updated {
-               uses group-types:group-statistics;
+           leaf group-stats-id {
+            type group-stats-ref;
+        }
+               
+               uses group-stats-response;
         uses tr:transaction-aware;
        }
        
        notification group-desc-stats-updated {
-               uses group-types:group-desc-stats;
+               leaf group-desc-id {
+            type group-desc-ref;
+        }
+       
+               uses group-desc-response;
         uses tr:transaction-aware;
        }
 
-       notification group-features {
-               uses group-types:group-features;
+       notification group-features-updated {
+               leaf group-features-id {
+            type group-features-ref;
+        }
+       
+               uses group-features-response;
         uses tr:transaction-aware;
        }
 }