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=0548890a00bcd87637d564002c7754780fa6821c;hb=1bd8f4df538150512bab41e1a3de946aedd9fc5f;hp=fc9be63ec89f0ec986fa386e6af0df3d1b36b607;hpb=2202c2e0c5e65783b02254a7cfc2b1fb6d84afe9;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 fc9be63ec8..0548890a00 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
@@ -14,11 +14,6 @@ module opendaylight-meter-types {
             type uint32;
     }
     
-    // field types
-    identity meter-flags {
-        description "Base identity for match Fields";
-    }
-    
     typedef meter-flags {        
         type bits {
             bit meter-kbps;
@@ -28,6 +23,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 +51,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 {
@@ -175,13 +206,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;