Fix for Bug#239

[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 d95b1e07b89c740ffb47ad2bd784ab544e13a376..891a61a34e322eb809945f084678590c3b4c3718 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -22,7 +22,7 @@
     }\r
 \r
     // Generic Structures\r
-        grouping port {\r
+        grouping port-grouping {\r
             reference "ofp_port";\r
             leaf port-no {\r
                 type uint32;\r
@@ -93,25 +93,13 @@
             }\r
         }\r
 \r
-        grouping match-grouping {\r
-            container match {\r
-                description "Match structure (OF v1.3)";\r
-                leaf type {\r
-                    type identityref {\r
-                        base oft:match-type-base;\r
-                    }\r
-                }\r
-                uses oxm:oxm-fields;\r
-            }\r
-        }\r
-\r
-        grouping buckets {\r
+        grouping buckets-grouping {\r
                 list buckets-list {\r
-                    uses bucket;\r
+                    uses bucket-grouping;\r
                 }\r
             }\r
 \r
-            grouping bucket {\r
+            grouping bucket-grouping {\r
                 description "Bucket for use in groups.";\r
                 leaf weight {\r
                     description "Relative weight of bucket. Only\r
@@ -131,16 +119,16 @@
                     type uint32;\r
                 }\r
 \r
-                uses ofaction:actions;\r
+                uses ofaction:actions-grouping;\r
             }\r
             \r
         container table-features-properties-container {\r
-            uses table-features-properties;\r
+            uses table-features-properties-grouping;\r
         }\r
 \r
-        grouping table-features-properties {\r
+        grouping table-features-properties-grouping {\r
             list table-feature-properties {\r
-                key "type";\r
+                config false;\r
                 leaf type {\r
                     type oft:table-features-prop-type;\r
                 }\r
@@ -271,7 +259,7 @@
                     type oft:action-type-v10;\r
                 }\r
                 list phy-port {\r
-                    uses port;\r
+                    uses port-grouping;\r
                 }\r
             }\r
             grouping get-config-request {\r
@@ -331,7 +319,7 @@
                     // Cookie of the flow entry that was looked up.\r
                     type uint64;\r
                 }\r
-                uses match-grouping;\r
+                uses oxm:match-grouping;\r
 \r
                 leaf data {\r
                     type binary;\r
@@ -377,7 +365,7 @@
                 leaf byte-count {\r
                     type uint64;\r
                 }\r
-                uses match-grouping;\r
+                uses oxm:match-grouping;\r
                 \r
                 // OF1.0 structures\r
                 uses oxm:match-v10-grouping;\r
@@ -387,7 +375,7 @@
                 \r
                 uses ofHeader;\r
                 \r
-                uses port;\r
+                uses port-grouping;\r
                 \r
                 leaf reason {\r
                     type oft:port-reason;\r
@@ -400,7 +388,7 @@
                 \r
                 uses ofHeader;\r
                 \r
-                uses ofaction:actions;\r
+                uses ofaction:actions-grouping;\r
                 \r
                 leaf data {\r
                     type binary;\r
@@ -451,16 +439,16 @@
                 leaf flags {\r
                     type oft:flow-mod-flags;\r
                 }\r
-                uses match-grouping;\r
+                uses oxm:match-grouping;\r
                 \r
-                uses ofinstruction:instructions;\r
+                uses ofinstruction:instructions-grouping;\r
                 \r
                 // OF1.0 structures\r
                 leaf flags-v10 {\r
                     type oft:flow-mod-flags-v10;\r
                 }\r
                 uses oxm:match-v10-grouping;\r
-                uses ofaction:actions;\r
+                uses ofaction:actions-grouping;\r
             } \r
             grouping group-mod {\r
                 reference "OFPT_GROUP_MOD message in Openflow Switch 1.3 Spec";\r
@@ -478,7 +466,7 @@
                     type oft:group-id;\r
                 }\r
                 \r
-                uses buckets;\r
+                uses buckets-grouping;\r
             }\r
             \r
             grouping port-mod {\r
@@ -565,7 +553,7 @@
                             leaf cookie-mask {\r
                                 type uint64;\r
                             }\r
-                            uses match-grouping;\r
+                            uses oxm:match-grouping;\r
                             \r
                             // OF1.0 structures\r
                             uses oxm:match-v10-grouping;\r
@@ -588,7 +576,7 @@
                             leaf cookie-mask {\r
                                 type uint64;\r
                             }\r
-                            uses match-grouping;\r
+                            uses oxm:match-grouping;\r
                             \r
                             // OF1.0 structures\r
                             uses oxm:match-v10-grouping;\r
@@ -681,7 +669,7 @@
                                 leaf max-entries {\r
                                     type uint32;\r
                                 }\r
-                                uses table-features-properties;\r
+                                uses table-features-properties-grouping;\r
                             }\r
                         }\r
                     }\r
@@ -772,13 +760,13 @@
                                 leaf byte-count {\r
                                     type uint64;\r
                                 }\r
-                                uses match-grouping;\r
+                                uses oxm:match-grouping;\r
                                 \r
-                                uses ofinstruction:instructions;\r
+                                uses ofinstruction:instructions-grouping;\r
                                 \r
                                 // OF1.0 structures\r
                                 uses oxm:match-v10-grouping;\r
-                                uses ofaction:actions;\r
+                                uses ofaction:actions-grouping;\r
                             }\r
                         }\r
                     }\r
@@ -949,7 +937,7 @@
                                 leaf group-id {\r
                                     type oft:group-id;\r
                                 }\r
-                                uses buckets;\r
+                                uses buckets-grouping;\r
                             }\r
                         }\r
                     }\r
@@ -1056,14 +1044,14 @@
                                 leaf max-entries {\r
                                     type uint32;\r
                                 }\r
-                                uses table-features-properties;\r
+                                uses table-features-properties-grouping;\r
                             }\r
                         }\r
                     }\r
                     case multipart-reply-port-desc-case {\r
                         container multipart-reply-port-desc {\r
                             list ports {\r
-                                uses port;\r
+                                uses port-grouping;\r
                             }\r
                         }\r
                     }\r
@@ -1131,7 +1119,7 @@
             }\r
             grouping queue-property-header {\r
                 list queue-property {\r
-                    key "property";\r
+                    config false;\r
                     leaf property {\r
                         type oft:queue-properties;\r
                     }\r
@@ -1169,7 +1157,7 @@
                 reference "OFPT_GET_ASYNC_REQUEST message in Openflow Switch 1.3 Spec";\r
                 /* Controller/switch message */\r
 \r
-                uses ofHeader;                \r
+                uses ofHeader;\r
             } \r
             grouping get-async-reply {\r
                 reference "OFPT_GET_ASYNC_REPLY message in Openflow Switch 1.3 Spec";\r