Merge "Invalid cast results in HTTP 500 error returned by the Neutron REST APIs."

[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..834e0a78358fa9cc55a5b419abc04f2e4fdeba87 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
@@ -6,80 +6,126 @@ module opendaylight-group-statistics {
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-group-types {prefix group-types;revision-date "2013-10-18";}
     import flow-capable-transaction {prefix tr;}
+    import flow-node-inventory {prefix fni;}
     
+    contact
+        "Anilkumar Vishnoi
+        Email: avishnoi@in.ibm.com";
+            
     revision "2013-11-11" {
         description "Initial revision of group statistics service";
     }
+    
+       grouping group-statistics {
+        container group-statistics {
+            //config "false";
+            uses group-types:group-statistics;
+        }
+       }    
+    
+    augment "/inv:nodes/inv:node/fni:group" {
+        ext:augment-identifier "node-group-statistics";
+        uses group-statistics;
+    }
+
+       grouping group-desc {
+        container group-desc {
+            //config "false";
+            uses group-types:group;
+        }
+       }
+    
+    augment "/inv:nodes/inv:node/group-types:group" {
+        ext:augment-identifier "node-group-desc-stats";
+        uses group-desc;
+    }
 
-       // RPC calls
-       rpc get-all-group-statistics {
-               input {
+       grouping group-features {
+               container group-features {
+            //config "false";
+            uses group-types:group-features-reply;
+        }
+    }
+           
+    augment "/inv:nodes/inv:node" {
+        ext:augment-identifier "node-group-features";
+        uses group-features;
+    }
+
+    // RPC calls
+    rpc get-all-group-statistics {
+        input {
             uses inv:node-context-ref;
         }
         output {
-            list group-statistics {
-                uses group-types:group-statistics;
-            }
+            uses group-types:group-statistics-reply;
             uses tr:transaction-aware;
         }
-       
-       }
-       
-       rpc get-group-statistics {
-               input {
+    
+    }
+    
+    rpc get-group-statistics {
+        input {
             uses inv:node-context-ref;
             leaf group-id{
-               type group-types:group-id;
+                type group-types:group-id;
             }
+           
         }
         output {
-            uses group-types:group-statistics;
+            uses group-types:group-statistics-reply;
             uses tr:transaction-aware;
         }
-       
-       }
-       
-       rpc get-group-description {
-               input {
+    
+    }
+    
+    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-types:group-desc-stats-reply;
             uses tr:transaction-aware;
         }
-       }
-       
-       rpc get-group-features {
-               input {
+    }
+    
+    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-types:group-features-reply;
             uses tr:transaction-aware;
         }
-       }
-       
+    }
+    
 
-       //Notification calls
-       
-       notification group-statistics-updated {
-               uses group-types:group-statistics;
+    //Notification calls
+    
+    notification group-statistics-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        uses inv:node;
+        uses group-types:group-statistics-reply;
         uses tr:transaction-aware;
-       }
-       
-       notification group-desc-stats-updated {
-               uses group-types:group-desc-stats;
+    }
+    
+    notification group-desc-stats-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        uses inv:node;
+        uses group-types:group-desc-stats-reply;
         uses tr:transaction-aware;
-       }
+    }
 
-       notification group-features {
-               uses group-types:group-features;
+    notification group-features-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        uses inv:node;
+        uses group-types:group-features-reply;
         uses tr:transaction-aware;
-       }
+    }
 }