Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."

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

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 e3b2a3fc6477430d676e0542b5db91667a704ba5..b2cf78b61de21902c31c6ae2b91d2112ca0d41de 100644 (file)
--- 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,6 +4,7 @@ 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;}
     
@@ -15,19 +16,19 @@ module opendaylight-meter-statistics {
         description "Initial revision of meter statistics service";
     }
 
-    augment "/inv:nodes/inv:node" {
+    augment "/inv:nodes/inv:node/flow-node:meter" {
         ext:augment-identifier "node-meter-statistics";
         container meter-statistics {
             //config "false";
-            uses meter-types:meter-statistics-reply;
+            uses meter-types:meter-statistics;
         }
     }
 
-    augment "/inv:nodes/inv:node" {
+    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-config-stats-reply;
+            uses meter-types:meter;
         }
     }