GroupId and MeterId used in model (as requested)

[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-protocol.yang

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 576a8926d1f5d55829a3296e24e799f888cec0ab..ec5f76bd9983b4ad2b45e9c7ae1df5201f7a9b28 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -479,7 +479,7 @@ module openflow-protocol {
                     type oft:group-type;\r
                 }\r
                 leaf group-id {\r
-                    type uint32;\r
+                    type oft:group-id;\r
                 }\r
                 \r
                 uses buckets;\r
@@ -612,7 +612,7 @@ module openflow-protocol {
                     }\r
                     case multipart-request-group {\r
                         leaf group-id {\r
-                            type uint32;\r
+                            type oft:group-id;\r
                         }\r
                     }\r
                     case multipart-request-group-desc {\r
@@ -627,12 +627,12 @@ module openflow-protocol {
                     }\r
                     case multipart-request-meter {\r
                         leaf meter-id {\r
-                            type uint32;\r
+                            type oft:meter-id;\r
                         }\r
                     }\r
                     case multipart-request-meter-config {\r
                         leaf meter-id {\r
-                            type uint32;\r
+                            type oft:meter-id;\r
                         }\r
                     }\r
                     case multipart-request-meter-features {\r
@@ -861,7 +861,7 @@ module openflow-protocol {
                     case multipart-reply-group {\r
                         list group-stats {\r
                             leaf group-id {\r
-                                type uint32;\r
+                                type oft:group-id;\r
                             }\r
                             leaf ref-count {\r
                                 type uint32;\r
@@ -894,7 +894,7 @@ module openflow-protocol {
                                 type oft:group-type;\r
                             }\r
                             leaf group-id {\r
-                                type uint32;\r
+                                type oft:group-id;\r
                             }\r
                             uses buckets;\r
                         }\r
@@ -916,7 +916,7 @@ module openflow-protocol {
                     case multipart-reply-meter {\r
                         list meter-stats {\r
                             leaf meter-id {\r
-                                type uint32;\r
+                                type oft:meter-id;\r
                             }\r
                             leaf flow-count {\r
                                 type uint32;\r
@@ -949,7 +949,7 @@ module openflow-protocol {
                                 type oft:meter-flags;\r
                             }\r
                             leaf meter-id {\r
-                                type uint32;\r
+                                type oft:meter-id;\r
                             }\r
                             list bands {\r
                                 uses meter-band-header;\r