pyang fixes for table/meter types

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

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
index d84b2f08511f466848886cb75aa4f418341d5563..1686cad3de0aacc365bcc195acc16314180cbb51 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
@@ -2,7 +2,6 @@ module opendaylight-meter-types {
     namespace "urn:opendaylight:meter:types";
     prefix meter;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
 
 
@@ -73,21 +72,21 @@ module opendaylight-meter-types {
     grouping band-type {
         choice band-type {
             case drop {
-                leaf rate {
+                leaf drop-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf drop-burst-size {
                     type uint32;
                 }
             }
 
             case dscp-remark {
-                leaf rate {
+                leaf dscp-remark-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf dscp-remark-burst-size {
                     type uint32;
                 }
                 
@@ -97,11 +96,11 @@ module opendaylight-meter-types {
             }
             
             case experimenter {
-                leaf rate {
+                leaf experimenter-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf experimenter-burst-size {
                     type uint32;
                 }
                 
@@ -151,11 +150,11 @@ module opendaylight-meter-types {
                     }
                 }
             
-                leaf rate {
+                leaf band-rate {
                     type uint32;
                 }
         
-                leaf burst-size {
+                leaf band-burst-size {
                     type uint32;
                 }
                 uses band-type;
@@ -262,4 +261,4 @@ module opendaylight-meter-types {
        uses meter-features;
     }
     
-}
\ No newline at end of file
+}