Added yang models for ofp_group and ofp_meter enums

Change-Id: Id63bd137966b87b7ba0fbf13cbfb7519a4d15b8c
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>

diff --git a/openflow-protocol-api/src/main/yang/openflow-types.yang b/openflow-protocol-api/src/main/yang/openflow-types.yang
index 6ccbd386e2616e79fa97385dd43355e510a4f847..c9e6990e1f4b00ab49cc084c17bf5986410c5e69 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -435,6 +435,29 @@ module openflow-types {
         }
     }
 
+       typedef group {
+               /* ofp_group - Group numbering. Groups can use any number up to OFPG_MAX.*/
+               type enumeration {
+                       enum OFPG_MAX {
+                               value -256; //0xffffff00
+                               description "Last usable group number";
+                       }
+                       
+                       /* Fake groups. */
+                       enum OFPG_ALL {
+                               value -4; //0xfffffffc
+                               description "Represents all groups for group delete commands";
+                       }
+                       enum OFPG_ANY {
+                               value -1; //0xffffffff
+                               description "Wildcard group used only for flow stats requests. 
+                                                               Selects all flows regardless of group (including flows with no group)";
+                               
+                       }
+               }
+               
+       }
+       
     typedef multipart-request-flags {
         description
             "enum ofp_multipart_request_flags ";
@@ -736,6 +759,31 @@ module openflow-types {
         }
     }
 
+       typedef meter {
+               /* ofp_meter - Meter numbering. Flow meters can use any number up to OFPM_MAX*/
+               type enumeration {
+                       enum OFPM_MAX {
+                               value -65536; //0xffff0000
+                               description "Last usable meter number";
+                       }
+                       
+                       /* Virtual meters. */
+                       enum OFPM_SLOWPATH {
+                               value -3; //0xfffffffd
+                               description "Meter for slow datapath";
+                       }
+                       enum OFPM_CONTROLLER {
+                               value -2; //0xfffffffe
+                               description "Meter for controller connection";
+                       }
+                       enum OFPM_ALL {
+                               value -1; //0xffffffff
+                               description "Represents all meters for stat requests commands";
+                       }
+               }
+               
+       }
+
     typedef table-config {
         /* ofp_table_config */
         type bits {