Merge "Added trasaction capabilities."

[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 cf309f12268d961689eb3f64adbef4b37f37d663..20353af7852bd0b46834e7ad61364b222ec89640 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,35 +2,35 @@ 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 enumeration {
-                enum meter-kbps;
-                enum meter_pktps;
-                enum meter_burst;
-                enum meter_stats;
+            type bits {
+                bit meter-kbps;
+                bit meter-pktps;
+                bit meter-burst;
+                bit meter-stats;
             }
         }
     }
     
     grouping meter-band-type {
         leaf flags {
-            type enumeration {
-                enum ofpmbt-drop;
-                enum ofpmbt-dscp-remark;
-                enum ofpmbt-experimenter;               
+            type bits {
+                bit ofpmbt-drop;
+                bit ofpmbt-dscp-remark;
+                bit ofpmbt-experimenter;               
             }
         }
     }
@@ -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 {