Merge "Added meter, action, group, flow models, mask and transactions support."

[controller.git] / opendaylight / md-sal / model / model-flow-base / src / main / yang / 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/meter-types.yang
index 971a8939f243d7d10cb1f9d575184018a9eac4d4..148ac9687f5baa8d66fa0fbfb143d91b6fdafb6f 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/meter-types.yang
@@ -2,25 +2,25 @@ module opendaylight-meter-types {
     namespace "urn:opendaylight:meter:types";
     prefix meter;
 
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
 
 
     revision "2013-09-18" {
         description "Initial revision of meter service";
     }
 
-    typedef meter-ref {
-            type instance-identifier;
+    typedef meter-id {
+            type uint32;
     }
     
     grouping meter-flags {
         leaf flags {
             type bits {
                 bit meter-kbps;
-                bit meter_pktps;
-                bit meter_burst;
-                bit meter_stats;
+                bit meter-pktps;
+                bit meter-burst;
+                bit meter-stats;
             }
         }
     }
@@ -82,7 +82,18 @@ module opendaylight-meter-types {
         uses meter-flags;        
         
         leaf meter-id {
-            type meter-ref;
+            type meter-id;
+        }
+        
+        leaf install {
+            type boolean; 
+        }
+        leaf meter-name {
+            type string;
+        }
+        
+        leaf container-name {
+            type string; 
         }
         
         container meter-band-headers {
@@ -96,6 +107,10 @@ module opendaylight-meter-types {
                     uses meter-band-type;
                 }
             
+                leaf rate {
+                    type uint32;
+                }
+        
                 leaf burst-size {
                     type uint32;
                 }