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 c1740d8abd27fa04c38fc88670cc755501adff65..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,132 +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";
     }
     
-    typedef group-stats-ref {
-        type instance-identifier;
-    }
-    
-    grouping group-stats-response {
-        uses "inv:node-context-ref";
-
-        list group-statistics{
-               uses group-types:group-statistics;
+       grouping group-statistics {
+        container group-statistics {
+            //config "false";
+            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;
+    augment "/inv:nodes/inv:node/fni:group" {
+        ext:augment-identifier "node-group-statistics";
+        uses group-statistics;
     }
 
-    typedef group-desc-ref {
-        type instance-identifier;
-    }
+       grouping group-desc {
+        container group-desc {
+            //config "false";
+            uses group-types:group;
+        }
+       }
     
-    grouping group-desc-response {
-        uses "inv:node-context-ref";
+    augment "/inv:nodes/inv:node/group-types:group" {
+        ext:augment-identifier "node-group-desc-stats";
+        uses group-desc;
+    }
 
-        list group-desc-stats {
-               uses group-types:group-desc-stats;
+       grouping group-features {
+               container group-features {
+            //config "false";
+            uses group-types:group-features-reply;
         }
     }
-    
-    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;
-               }
+           
+    augment "/inv:nodes/inv:node" {
+        ext:augment-identifier "node-group-features";
+        uses group-features;
     }
 
-       // RPC calls
-       rpc get-all-group-statistics {
-               input {
+    // RPC calls
+    rpc get-all-group-statistics {
+        input {
             uses inv:node-context-ref;
         }
         output {
-               uses group-stats-response;
+            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-stats-response;
+            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;
         }
         output {
-            uses group-desc-response;
+            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;
         }
         output {
-            uses group-features-response;
+            uses group-types:group-features-reply;
             uses tr:transaction-aware;
         }
-       }
-       
+    }
+    
 
-       //Notification calls
-       
-       notification group-statistics-updated {
-           leaf group-stats-id {
-            type group-stats-ref;
+    //Notification calls
+    
+    notification group-statistics-updated {
+        leaf moreReplies {
+            type boolean;
         }
-               
-               uses group-stats-response;
+        uses inv:node;
+        uses group-types:group-statistics-reply;
         uses tr:transaction-aware;
-       }
-       
-       notification group-desc-stats-updated {
-               leaf group-desc-id {
-            type group-desc-ref;
+    }
+    
+    notification group-desc-stats-updated {
+        leaf moreReplies {
+            type boolean;
         }
-       
-               uses group-desc-response;
+        uses inv:node;
+        uses group-types:group-desc-stats-reply;
         uses tr:transaction-aware;
-       }
+    }
 
-       notification group-features-updated {
-               leaf group-features-id {
-            type group-features-ref;
+    notification group-features-updated {
+        leaf moreReplies {
+            type boolean;
         }
-       
-               uses group-features-response;
+        uses inv:node;
+        uses group-types:group-features-reply;
         uses tr:transaction-aware;
-       }
+    }
 }