X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fmodel-flow-statistics%2Fsrc%2Fmain%2Fyang%2Fopendaylight-meter-statistics.yang;h=d764f7261a2e56dc9b899e550fe81a3410935619;hb=a425274a36f7ea227ba3ec7181ee646b5fa50d40;hp=0055dc39bdef417548fb5ef0ddcfa118cff74c03;hpb=20c6d51283ad86f229b9f77977acfeb86902f902;p=openflowplugin.git

diff --git a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
index 0055dc39bd..d764f7261a 100644
--- a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
+++ b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
@@ -5,9 +5,12 @@ 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;}
-    
+    import opendaylight-meter-types {prefix meter-types; revision-date "2013-09-18";}
+    import flow-capable-transaction {prefix tr; revision-date "2015-03-04";}
+    import opendaylight-multipart-types { prefix multipart; revision-date "2017-01-12"; }
+
+    description "Openflowplugin meter statistics structures.";
+
     contact
         "Anilkumar Vishnoi
         Email: avishnoi@in.ibm.com";
@@ -17,31 +20,33 @@ module opendaylight-meter-statistics {
     }
 
     augment "/inv:nodes/inv:node/flow-node:meter" {
+        description "Openflow meter statistics data into the meter node.";
         ext:augment-identifier "node-meter-statistics";
         container meter-statistics {
-            //config "false";
             uses meter-types:meter-statistics;
         }
     }
 
     augment "/inv:nodes/inv:node/flow-node:meter" {
+        description "Openflow meter config statistics data into the meter node.";
         ext:augment-identifier "node-meter-config-stats";
         container meter-config-stats {
-            //config "false";
             uses meter-types:meter;
         }
     }
-    
+
     augment "/inv:nodes/inv:node" {
+        description "Openflow meter features data into the inventory node node.";
         ext:augment-identifier "node-meter-features";
         container meter-features {
-            //config "false";
             uses meter-types:meter-features-reply;
         }
     }
 
     // RPC calls
     rpc get-all-meter-statistics {
+        status deprecated;
+
         input {
             uses inv:node-context-ref;
         }
@@ -49,10 +54,12 @@ module opendaylight-meter-statistics {
             uses meter-types:meter-statistics-reply;
             uses tr:transaction-aware;
         }
-    
+
     }
-    
+
     rpc get-meter-statistics {
+        status deprecated;
+
         input {
             uses inv:node-context-ref;
             leaf meter-id{
@@ -63,10 +70,12 @@ module opendaylight-meter-statistics {
             uses meter-types:meter-statistics-reply;
             uses tr:transaction-aware;
         }
-    
+
     }
-    
+
     rpc get-all-meter-config-statistics {
+        status deprecated;
+
         input {
             uses inv:node-context-ref;
         }
@@ -75,8 +84,10 @@ module opendaylight-meter-statistics {
             uses tr:transaction-aware;
         }
     }
-    
+
     rpc get-meter-features {
+        status deprecated;
+
         input {
             uses inv:node-context-ref;
         }
@@ -85,25 +96,61 @@ module opendaylight-meter-statistics {
             uses tr:transaction-aware;
         }
     }
-    
+
 
     //Notification calls
-    
+
     notification meter-statistics-updated {
+        status deprecated;
+
         uses inv:node;
         uses meter-types:meter-statistics-reply;
         uses tr:multipart-transaction-aware;
     }
-    
+
     notification meter-config-stats-updated {
+        status deprecated;
+
         uses inv:node;
         uses meter-types:meter-config-stats-reply;
         uses tr:multipart-transaction-aware;
     }
 
     notification meter-features-updated {
+        status deprecated;
+
         uses inv:node;
         uses meter-types:meter-features-reply;
         uses tr:multipart-transaction-aware;
     }
+
+    augment "/multipart:multipart-reply/multipart:multipart-reply-body" {
+        case multipart-reply-meter-stats {
+            uses meter-types:meter-statistics-reply;
+        }
+
+        case multipart-reply-meter-config {
+            uses meter-types:meter-config-stats-reply;
+        }
+
+        case multipart-reply-meter-features {
+            uses meter-types:meter-features-reply;
+        }
+    }
+
+    augment "/multipart:multipart-request/multipart:multipart-request-body" {
+        case multipart-request-meter-config {
+            leaf meter-id {
+                type meter-types:meter-id;
+            }
+        }
+        case multipart-request-meter-features {
+            // Empty request case
+        }
+        case multipart-request-meter-stats {
+            leaf stat-meter-id {
+                type meter-types:meter-id;
+            }
+        }
+    }
 }