MD-SAL Statistics Manager - Fixed keys of group and meter models and their sub component

[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 fc9be63ec89f0ec986fa386e6af0df3d1b36b607..b380af22129c44f068bb02d50aa57283e8bfbac0 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
@@ -11,12 +11,10 @@ module opendaylight-meter-types {
     }
 
     typedef meter-id {
-            type uint32;
+        type uint32;
     }
-    
-    // field types
-    identity meter-flags {
-        description "Base identity for match Fields";
+    typedef band-id {
+       type uint32;
     }
     
     typedef meter-flags {        
@@ -28,6 +26,26 @@ module opendaylight-meter-types {
         }        
     }
     
+    identity meter-capability {
+       description "Base identity for all the supported meter capabilities/flags";
+    }
+    identity meter-kbps {
+       base meter-capability;
+       description "Rate value in kb/s (kilo-bit per second)";
+    } 
+    identity meter-pktps {
+       base meter-capability;
+       description "Rate value in packet/sec.";
+    } 
+    identity meter-burst {
+       base meter-capability;
+       description "Do burst size.";
+    } 
+    identity meter-stats {
+       base meter-capability;
+       description "Collect statistics.";
+    } 
+    
     typedef meter-band-type {
         type bits {
             bit ofpmbt-drop;
@@ -36,6 +54,22 @@ module opendaylight-meter-types {
         }
     }
     
+    identity meter-band {
+       description "Base identity for all the band type available";
+    }
+    identity meter-band-drop {
+       base meter-band;
+       description "Drop packet";
+    }
+    identity meter-band-dscp-remark {
+       base meter-band;
+       description "Remark DSCP in the IP header";
+    }
+    identity meter-band-experimenter {
+       base meter-band;
+       description "Experimenter meter band";
+    }
+
     grouping band-type {
         choice band-type {
             case drop {
@@ -101,9 +135,9 @@ module opendaylight-meter-types {
         
         container meter-band-headers {
             list meter-band-header {
-                key "order";
-                leaf order {
-                    type int32;
+                key "band-id";
+                leaf band-id {
+                    type band-id;
                 }
                 
                 container meter-band-types {
@@ -127,7 +161,7 @@ module opendaylight-meter-types {
     grouping meter-statistics {
             
         leaf meter-id {
-            type int32;
+            type meter-id;
         }
         
         leaf flow-count {
@@ -153,9 +187,9 @@ module opendaylight-meter-types {
         
         container meter-band-stats {
             list band-stat {
-                key "order";
-                leaf order {
-                    type int32;
+                key "band-id";
+                leaf band-id {
+                    type band-id;
                 }
             
                 leaf packet-band-count {
@@ -175,13 +209,17 @@ module opendaylight-meter-types {
             type yang:counter32;
         }
            
-        leaf band_types {
-            type yang:counter32;
-        }
+       leaf-list meter-band-supported {
+               type identityref {
+                       base meter-band;
+               }
+               }
         
-        leaf capabilities {
-            type yang:counter32;
-        }
+       leaf-list meter-capabilities-supported {
+               type identityref {
+                       base meter-capability;
+               }
+               }
         
         leaf max_bands {
             type uint8;
@@ -195,30 +233,22 @@ module opendaylight-meter-types {
     grouping meter-stats-config-request {
         list meter-stats {
             key "meter-id";         
-            
             leaf meter-id {
-                type int32;
+                type meter-id;
             }           
         }
     }
     
     grouping meter-statistics-reply {
         list meter-stats {
-            key "meter-stats-order";
-            leaf meter-stats-order {
-                type int32;
-            }
+            key "meter-id";
             uses meter-statistics;
         }
     }
     
     grouping meter-config-stats-reply {
         list meter-config-stats {
-            key "meter-config-order";
-            leaf meter-config-order {
-                type int32;
-            }
-            
+            key "meter-id";
             uses meter;
         } 
     }