X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-statistics%2Fsrc%2Fmain%2Fyang%2Fmeter-statistics.yang;h=b2cf78b61de21902c31c6ae2b91d2112ca0d41de;hp=18dd60d08ddc87a4f8bf45e76b006e7d3d607818;hb=c541f7868e6e2d654b8080b5426bb12a39bddf11;hpb=d29fdfd7e68069afd72809271b5c556ad1ab2bd8

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
index 18dd60d08d..b2cf78b61d 100644
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
@@ -4,123 +4,118 @@ module opendaylight-meter-statistics {
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import opendaylight-meter-types {prefix meter-types;revision-date "2013-09-18";}
     import flow-capable-transaction {prefix tr;}
     
+    contact
+        "Anilkumar Vishnoi
+        Email: avishnoi@in.ibm.com";
 
     revision "2013-11-11" {
         description "Initial revision of meter statistics service";
     }
 
-    typedef meter-stats-ref {
-        type instance-identifier;
-    }
-    
-    grouping meter-stats-response {
-        uses "inv:node-context-ref";
-
-        leaf meter-stats-id {
-            type meter-stats-ref;
+    augment "/inv:nodes/inv:node/flow-node:meter" {
+        ext:augment-identifier "node-meter-statistics";
+        container meter-statistics {
+            //config "false";
+            uses meter-types:meter-statistics;
         }
-        uses meter-types:meter-statistics;
-    }
-
-    typedef meter-config-ref {
-        type instance-identifier;
     }
-    
-    grouping meter-config-response {
-        uses "inv:node-context-ref";
 
-        leaf meter-config-id {
-            type meter-config-ref;
+    augment "/inv:nodes/inv:node/flow-node:meter" {
+        ext:augment-identifier "node-meter-config-stats";
+        container meter-config-stats {
+            //config "false";
+            uses meter-types:meter;
         }
-        uses meter-types:meter-config-stats;
-    }
-
-    typedef meter-features-ref {
-        type instance-identifier;
     }
     
-    grouping meter-features-response {
-        uses "inv:node-context-ref";
-
-        leaf meter-features-id {
-            type meter-features-ref;
+    augment "/inv:nodes/inv:node" {
+        ext:augment-identifier "node-meter-features";
+        container meter-features {
+            //config "false";
+            uses meter-types:meter-features-reply;
         }
-        uses meter-types:meter-features;
     }
 
-	// RPC calls
-	rpc get-all-meter-statistics {
-		input {
+    // RPC calls
+    rpc get-all-meter-statistics {
+        input {
             uses inv:node-context-ref;
         }
         output {
-            list meter-statistics {
-                uses meter-stats-response;
-                uses tr:transaction-aware;
-            }
+            uses meter-types:meter-statistics-reply;
+            uses tr:transaction-aware;
         }
-	
-	}
-	
-	rpc get-meter-statistics {
-		description "RPC Method to send meter statistics request to the give switch for specific meter"; 
-		input {
+    
+    }
+    
+    rpc get-meter-statistics {
+        input {
             uses inv:node-context-ref;
             leaf meter-id{
-            	type meter-types:meter-id;
+                type meter-types:meter-id;
             }
         }
         output {
-            uses meter-stats-response;
+            uses meter-types:meter-statistics-reply;
             uses tr:transaction-aware;
         }
-	
-	}
-	
-	rpc get-meter-config-statistics {
-		input {
+    
+    }
+    
+    rpc get-all-meter-config-statistics {
+        input {
             uses inv:node-context-ref;
-            leaf meter-id{
-            	type meter-types:meter-id;
-            }
         }
         output {
-        	uses meter-config-response;
+               uses meter-types:meter-config-stats-reply;
             uses tr:transaction-aware;
         }
-	}
-	
-	rpc get-meter-features {
-		input {
+    }
+    
+    rpc get-meter-features {
+        input {
             uses inv:node-context-ref;
-            leaf meter-id{
-            	type meter-types:meter-id;
-	        }
         }
         output {
-        	uses meter-features-response;
+            uses meter-types:meter-features-reply;
             uses tr:transaction-aware;
         }
-	}
-	
+    }
+    
 
-	//Notification calls
-	
-	notification meter-statistics-updated {
-		uses meter-stats-response;
+    //Notification calls
+    
+    notification meter-statistics-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        
+        uses inv:node;
+        uses meter-types:meter-statistics-reply;
         uses tr:transaction-aware;
-	}
-	
-	notification meter-config-stats-updated {
-		uses meter-config-response;
+    }
+    
+    notification meter-config-stats-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        
+        uses inv:node;
+        uses meter-types:meter-config-stats-reply;
         uses tr:transaction-aware;
-	}
+    }
 
-	notification meter-features-updated {
-		uses meter-features-response;
+    notification meter-features-updated {
+        leaf moreReplies {
+            type boolean;
+        }
+        
+        uses inv:node;
+        uses meter-types:meter-features-reply;
         uses tr:transaction-aware;
-	}
+    }
 }