X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-base%2Fsrc%2Fmain%2Fyang%2Fmeter-types.yang;h=d26ca667996f164f9ca7f8b57c6df25a7c381563;hb=2358bb82310cb0261da5dbd95a1c45bb6b27617e;hp=cf309f12268d961689eb3f64adbef4b37f37d663;hpb=6b64494fd8e4654a298312afb4b8e6e827b75d5d;p=controller.git

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 cf309f1226..d26ca66799 100644
--- 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 {
@@ -96,6 +107,10 @@ module opendaylight-meter-types {
                     uses meter-band-type;
                 }
             
+                leaf rate {
+                    type uint32;
+                }
+        
                 leaf burst-size {
                     type uint32;
                 }
@@ -104,16 +119,6 @@ module opendaylight-meter-types {
         }
     }
     
-    grouping meter-stats-config-request {
-        list meter-stats {
-            key "meter-id";         
-            
-            leaf meter-id {
-                type int32;
-            }           
-        }
-    }
-    
     grouping meter-statistics {
             
         leaf meter-id {
@@ -159,6 +164,39 @@ module opendaylight-meter-types {
         }
     }
 
+    grouping meter-features {
+		            
+        leaf max_meter {
+            type yang:counter32;
+        }
+           
+        leaf band_types {
+            type yang:counter32;
+        }
+        
+        leaf capabilities {
+            type yang:counter32;
+        }
+        
+        leaf max_bands {
+            type uint8;
+        }
+        
+        leaf max_color {
+            type uint8;
+        }
+    }
+
+    grouping meter-stats-config-request {
+        list meter-stats {
+            key "meter-id";         
+            
+            leaf meter-id {
+                type int32;
+            }           
+        }
+    }
+    
     grouping meter-statistics-reply {
         list meter-stats {
             key "meter-stats-order";
@@ -169,10 +207,9 @@ module opendaylight-meter-types {
         }
     }
     
-    grouping meter-config-stats {
+    grouping meter-config-stats-reply {
         list meter-config-stats {
             key "meter-config-order";
-            
             leaf meter-config-order {
                 type int32;
             }
@@ -181,33 +218,8 @@ module opendaylight-meter-types {
         } 
     }
     
-    grouping meter-features {
-        list meter-features {
-            key "meter-feature-order";
-            
-            leaf meter-feature-order {
-                type yang:counter32;
-            }          
-            
-            leaf max_meter {
-                type yang:counter32;
-            }
-            
-            leaf band_types {
-                type yang:counter32;
-            }
-            
-            leaf capabilities {
-                type yang:counter32;
-            }
-            
-            leaf max_bands {
-                type uint8;
-            }
-            
-            leaf max_color {
-                type uint8;
-            }
-        }
-    }    
+    grouping meter-features-reply {
+    	uses meter-features;
+    }
+    
 }
\ No newline at end of file