Quickfix: MultipartReplyTableFeatures -> config is table config

[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 ad06525b6fb83cc603e5656e8b51524561aeeb8a..2202da24112f1f41a250dc16b9192689b036017f 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -183,18 +183,20 @@ module openflow-protocol {
                 uses ofHeader;\r
                 \r
                 leaf type {\r
-                    type oft:error-type;\r
+                    type uint16;\r
                 }\r
                 leaf code {\r
                     type uint16;\r
                 }\r
+                leaf type-string {\r
+                    type string;\r
+                }\r
+                leaf code-string {\r
+                    type string;\r
+                }\r
                 leaf data {\r
                     type binary; \r
                 }\r
-                // OF1.0 structures\r
-                leaf type-v10 {\r
-                    type oft:error-type-v10;\r
-                }\r
             }\r
             grouping echo-request {\r
                 // reference "OFPT_ECHO_REQUEST message in Openflow Switch 1.3 Spec"\r
@@ -523,7 +525,7 @@ module openflow-protocol {
                     type oft:table-id;\r
                 }\r
                 leaf config {\r
-                    type oft:port-config;\r
+                    type oft:table-config;\r
                 }\r
             } \r
             \r
@@ -542,7 +544,9 @@ module openflow-protocol {
                 }      \r
                 choice multipart-request-body {\r
                     case multipart-request-desc {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-flow {\r
                         leaf table-id {\r
@@ -587,7 +591,9 @@ module openflow-protocol {
                         uses oxm:match-v10-grouping;\r
                     }\r
                     case multipart-request-table {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-port-stats {\r
                         leaf port-no {\r
@@ -608,10 +614,14 @@ module openflow-protocol {
                         }\r
                     }\r
                     case multipart-request-group-desc {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-group-features {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-meter {\r
                         leaf meter-id {\r
@@ -624,7 +634,9 @@ module openflow-protocol {
                         }\r
                     }\r
                     case multipart-request-meter-features {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-table-features {\r
                         list table-features {\r
@@ -650,7 +662,9 @@ module openflow-protocol {
                         }\r
                     }\r
                     case multipart-request-port-desc {\r
-                        // empty body\r
+                        leaf empty {\r
+                            type empty;\r
+                        }\r
                     }\r
                     case multipart-request-experimenter {\r
                         leaf experimenter {\r
@@ -972,7 +986,7 @@ module openflow-protocol {
                                 type binary;\r
                             }\r
                             leaf config {\r
-                                type oft:port-config;\r
+                                type oft:table-config;\r
                             } \r
                             leaf max-entries {\r
                                 type uint32;\r
@@ -1091,7 +1105,17 @@ module openflow-protocol {
                 /* Controller/switch message */\r
 \r
                 uses ofHeader;\r
+                uses async-body-grouping;\r
+            } \r
+            grouping set-async {\r
+                // reference "OFPT_SET_ASYNC message in Openflow Switch 1.3 Spec"\r
+                /* Controller/switch message */\r
                 \r
+                uses ofHeader;\r
+                uses async-body-grouping;\r
+            }\r
+            \r
+            grouping async-body-grouping {\r
                 list packet-in-mask {\r
                     leaf-list mask {\r
                         type oft:packet-in-reason;\r
@@ -1107,23 +1131,7 @@ module openflow-protocol {
                         type oft:flow-removed-reason;\r
                     }\r
                 }\r
-            } \r
-            grouping set-async {\r
-                // reference "OFPT_SET_ASYNC message in Openflow Switch 1.3 Spec"\r
-                /* Controller/switch message */\r
-                \r
-                uses ofHeader;\r
-                \r
-                leaf-list packet-in-mask {\r
-                    type oft:packet-in-reason;\r
-                }\r
-                leaf-list port-status-mask {\r
-                    type oft:port-reason;\r
-                }\r
-                leaf-list flow-removed-mask {\r
-                    type oft:flow-removed-reason;\r
-                }\r
-            } \r
+            }\r
             /* Meters and rate limiters configuration messages. */\r
             grouping meter-mod {\r
                 // reference "OFPT_METER_MOD message in Openflow Switch 1.3 Spec"\r