Yang model fixed
[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-protocol.yang
index 7f65a22b444aca36113425f860750d289359dd7d..7a71c1ce89843cb9dc63f8d21fd6effbc190e670 100644 (file)
@@ -2,7 +2,6 @@ module openflow-protocol {
     namespace "urn:opendaylight:openflow:protocol";\r
     prefix "ofproto";\r
 \r
-    import ietf-inet-types {prefix inet;}\r
     import ietf-yang-types {prefix yang;}\r
     \r
     import openflow-types {prefix oft;}\r
@@ -57,27 +56,59 @@ module openflow-protocol {
                 // reference "ofp_port.peer"; \r
                 type oft:port-features; \r
             }\r
-            leaf curr_speed { \r
+            leaf curr-speed { \r
                 description "Current port bitrate in kbps.";\r
                 // reference "ofp_port.curr_speed"; \r
                 type uint32; \r
                 units "kbps";\r
             }\r
-            leaf max_speed { \r
+            leaf max-speed { \r
                 description "Max port bitrate in kbps";\r
                 // reference "ofp_port.max_speed"; \r
                 type uint32;\r
                 units "kbps"; \r
             }\r
+            \r
+            // OF1.0 structures\r
+            leaf config-v10 { \r
+                // reference "ofp_port.config"; \r
+                type oft:port-config-v10;\r
+            }\r
+            leaf state-v10 { \r
+                // reference "ofp_port.state"; \r
+                type oft:port-state-v10;\r
+            }\r
+            leaf current-features-v10 { \r
+                description "Current features.";\r
+                // reference "ofp_port.curr"; \r
+                type oft:port-features-v10; \r
+            }\r
+            leaf advertised-features-v10 { \r
+                description "Features being advertised by the port.";\r
+                // reference "ofp_port.advertised"; \r
+                type oft:port-features-v10; \r
+            }\r
+            leaf supported-features-v10 { \r
+                description "Features supported by the port.";\r
+                // reference "ofp_port.supported"; \r
+                type oft:port-features-v10; \r
+            }\r
+            leaf peer-features-v10 { \r
+                description "Features advertised by peer.";\r
+                // reference "ofp_port.peer"; \r
+                type oft:port-features-v10; \r
+            }\r
         }\r
-\r
-        grouping match {\r
-            leaf type {\r
-                type identityref {\r
-                    base oft:match-type-base;\r
+        \r
+        grouping match-grouping {\r
+            container match {\r
+                leaf type {\r
+                    type identityref {\r
+                        base oft:match-type-base;\r
+                    }\r
                 }\r
+                uses oxm:oxm-fields;\r
             }\r
-            uses oxm:oxm-fields;\r
         }\r
 \r
         grouping buckets {\r
@@ -106,14 +137,13 @@ module openflow-protocol {
 \r
         grouping table-features-properties {\r
             list table-feature-properties {\r
+                key "type";\r
                 leaf type {\r
                     type oft:table-features-prop-type;\r
                 }\r
             }\r
         }\r
 \r
-    // TODO: ofp_packet_queue\r
-\r
     // # MESSAGE Structures\r
         /* Immutable messages. */\r
             grouping ofHeader {\r
@@ -145,10 +175,6 @@ module openflow-protocol {
                     leaf-list version-bitmap {\r
                         type boolean;\r
                     }\r
-                    \r
-                    leaf data {\r
-                        type binary;\r
-                    }\r
                 }\r
             }\r
             grouping error {\r
@@ -157,11 +183,17 @@ 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
@@ -223,11 +255,21 @@ module openflow-protocol {
                     type uint8;\r
                 }\r
                 leaf capabilities {\r
-                    type uint32;\r
+                    type oft:capabilities;\r
                 }\r
                 leaf reserved {\r
                     type uint32;\r
                 }\r
+                // OF1.0 structures\r
+                leaf capabilities-v10 {\r
+                    type oft:capabilities-v10;\r
+                }\r
+                leaf actions-v10 {\r
+                    type oft:action-type-v10;\r
+                }\r
+                list phy-port {\r
+                    uses port;\r
+                }\r
             }\r
             grouping get-config-request {\r
                 // reference "OFPT_GET_CONFIG_REQUEST message in Openflow Switch 1.3 Spec"\r
@@ -252,7 +294,7 @@ module openflow-protocol {
                 \r
                 uses ofHeader;\r
                 \r
-                leaf-list flags {\r
+                leaf flags {\r
                     type oft:switch-config-flag;\r
                 }\r
                 leaf miss-send-len {\r
@@ -276,7 +318,7 @@ module openflow-protocol {
                 }\r
                 leaf reason {\r
                     // Reason packet is being sent (one of OFPR_*) \r
-                    type uint8;\r
+                    type oft:packet-in-reason;\r
                 }\r
                 leaf table-id {\r
                     // ID of the table that was looked up\r
@@ -286,10 +328,8 @@ module openflow-protocol {
                     // Cookie of the flow entry that was looked up.\r
                     type uint64;\r
                 }\r
-                container match {\r
-                    uses match;\r
-                }\r
-\r
+                uses match-grouping;\r
+                \r
 // struct ofp_match match; /* Packet metadata. Variable size. */\r
 // /* The variable size and padded match is always followed by:\r
 //  *   - Exactly 2 all-zero padding bytes, then\r
@@ -301,6 +341,10 @@ module openflow-protocol {
                     type binary;\r
                 }\r
                 \r
+                // OF1.0 structures\r
+                leaf in-port {\r
+                    type uint16;\r
+                }\r
             }\r
             grouping flow-removed {\r
                 // reference "OFPT_FLOW_REMOVED message in Openflow Switch 1.3 Spec"\r
@@ -337,9 +381,10 @@ module openflow-protocol {
                 leaf byte-count {\r
                     type uint64;\r
                 }\r
-                container match {\r
-                    uses match;\r
-                }\r
+                uses match-grouping;\r
+                \r
+                // OF1.0 structures\r
+                uses oxm:match-v10-grouping;\r
             } \r
             grouping port-status {\r
                 // reference "OFPT_PORT_STATUS message in Openflow Switch 1.3 Spec"\r
@@ -410,11 +455,16 @@ module openflow-protocol {
                 leaf flags {\r
                     type oft:flow-mod-flags;\r
                 }\r
-                container match {\r
-                    uses match;\r
-                }\r
+                uses match-grouping;\r
                 \r
                 uses ofinstruction:instructions;\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
             } \r
             grouping group-mod {\r
                 // reference "OFPT_GROUP_MOD message in Openflow Switch 1.3 Spec"\r
@@ -429,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
@@ -452,10 +502,20 @@ module openflow-protocol {
                 }   \r
                 leaf mask {\r
                     type oft:port-config;\r
-                }  \r
+                }\r
                 leaf advertise {\r
                     type oft:port-features;\r
                 }\r
+                // OF1.0 structures\r
+                leaf config-v10 {\r
+                    type oft:port-config-v10;\r
+                }\r
+                leaf mask-v10 {\r
+                    type oft:port-config-v10;\r
+                }\r
+                leaf advertise-v10 {\r
+                    type oft:port-features-v10;\r
+                }\r
             } \r
             grouping table-mod {\r
                 // reference "OFPT_TABLE_MOD message in Openflow Switch 1.3 Spec"\r
@@ -467,8 +527,8 @@ module openflow-protocol {
                     type oft:table-id;\r
                 }\r
                 leaf config {\r
-                    type oft:port-config;\r
-                }                \r
+                    type oft:table-config;\r
+                }\r
             } \r
             \r
         /* Multipart messages. */\r
@@ -485,429 +545,531 @@ module openflow-protocol {
                     type oft:multipart-request-flags;\r
                 }      \r
                 choice multipart-request-body {\r
-                    case multipart-request-flow {\r
-                        leaf table-id {\r
-                            type uint8;\r
-                        }\r
-                        leaf out-port {\r
-                            type uint32;\r
-                        }\r
-                        leaf out-group {\r
-                            type uint32;\r
-                        }\r
-                        leaf cookie {\r
-                            type uint64;\r
-                        }\r
-                        leaf cookie-mask {\r
-                            type uint64;\r
-                        }\r
-                        container match {\r
-                            uses match;\r
-                        }\r
-                    }\r
-                    case multipart-request-aggregate {\r
-                        leaf table-id {\r
-                            type uint8;\r
-                        }\r
-                        leaf out-port {\r
-                            type uint32;\r
-                        }\r
-                        leaf out-group {\r
-                            type uint32;\r
-                        }\r
-                        leaf cookie {\r
-                            type uint64;\r
-                        }\r
-                        leaf cookie-mask {\r
-                            type uint64;\r
-                        }\r
-                        container match {\r
-                            uses match;\r
-                        }\r
-                    }\r
-                    case multipart-request-port-stats {\r
-                        leaf port-no {\r
-                            type uint32;\r
-                        }\r
-                    }\r
-                    case multipart-request-queue {\r
-                        leaf port-no {\r
-                            type uint32;\r
-                        }\r
-                        leaf queue-id {\r
-                            type uint32;\r
-                        }\r
-                    }\r
-                    case multipart-request-group {\r
-                        leaf group-id {\r
-                            type uint32;\r
-                        }\r
-                    }\r
-                    case multipart-request-meter {\r
-                        leaf meter-id {\r
-                            type uint32;\r
-                        }\r
-                    }\r
-                    case multipart-request-meter-config {\r
-                        leaf meter-id {\r
-                            type uint32;\r
+                    case multipart-request-desc-case {\r
+                        container multipart-request-desc {\r
+                            leaf empty {\r
+                                type empty;\r
+                            }\r
                         }\r
                     }\r
-                    case multipart-request-table-features {\r
-                        list table-features {\r
+                    case multipart-request-flow-case {\r
+                        container multipart-request-flow {\r
                             leaf table-id {\r
                                 type uint8;\r
                             }\r
-                            leaf name {\r
-                                type string;\r
+                            leaf out-port {\r
+                                type uint32;\r
                             }\r
-                            leaf metadata-match {\r
-                                type uint64;\r
+                            leaf out-group {\r
+                                type uint32;\r
                             }\r
-                            leaf metadata-write {\r
+                            leaf cookie {\r
                                 type uint64;\r
                             }\r
-                            leaf config {\r
-                                type oft:table-config;\r
-                            }\r
-                            leaf max-entries {\r
-                                type uint32;\r
+                            leaf cookie-mask {\r
+                                type uint64;\r
                             }\r
-                            uses table-features-properties;\r
-                        }\r
-                    }\r
-                    case multipart-request-experimenter {\r
-                        leaf experimenter {\r
-                            type uint32;\r
-                        }\r
-                        leaf exp-type {\r
-                            type uint32;\r
-                        }\r
-                    }\r
-                }\r
-            } \r
-            grouping multipart-reply {\r
-                // reference "OFPT_MULTIPART_REPLY message in Openflow Switch 1.3 Spec"\r
-                /* Controller/switch message */\r
-\r
-                uses ofHeader;\r
-                \r
-                leaf type {\r
-                    type oft:multipart-type;\r
-                }\r
-                leaf flags {\r
-                    type oft:multipart-request-flags;\r
-                }\r
-                choice multipart-reply-body {\r
-                    case multipart-reply-desc {\r
-                        leaf mfr_desc {\r
-                            type string;\r
-                        }\r
-                        leaf hw_desc {\r
-                            type string;\r
-                        }\r
-                        leaf sw_desc {\r
-                            type string;\r
-                        }\r
-                        leaf serial_num {\r
-                            type string;\r
-                        }\r
-                        leaf dp_desc {\r
-                            type string;\r
+                            uses match-grouping;\r
+                            \r
+                            // OF1.0 structures\r
+                            uses oxm:match-v10-grouping;\r
                         }\r
                     }\r
-                    case multipart-reply-flow {\r
-                        list flow-stats {\r
+                    case multipart-request-aggregate-case {\r
+                        container multipart-request-aggregate {\r
                             leaf table-id {\r
                                 type uint8;\r
                             }\r
-                            leaf duration-sec {\r
+                            leaf out-port {\r
                                 type uint32;\r
                             }\r
-                            leaf duration-nsec {\r
+                            leaf out-group {\r
                                 type uint32;\r
                             }\r
-                            leaf priority {\r
-                                type uint16;\r
-                            }\r
-                            leaf idle-timeout {\r
-                                type uint16;\r
-                            }\r
-                            leaf hard-timeout {\r
-                                type uint16;\r
-                            }\r
-                            leaf flags {\r
-                                type oft:flow-mod-flags;\r
-                            }\r
                             leaf cookie {\r
                                 type uint64;\r
                             }\r
-                            leaf packet-count {\r
-                                type uint64;\r
-                            }\r
-                            leaf byte-count {\r
+                            leaf cookie-mask {\r
                                 type uint64;\r
                             }\r
-                            container match {\r
-                                uses match;\r
-                            }\r
+                            uses match-grouping;\r
                             \r
-                            uses ofinstruction:instructions;\r
+                            // OF1.0 structures\r
+                            uses oxm:match-v10-grouping;\r
                         }\r
                     }\r
-                    case multipart-reply-aggregate {\r
-                        leaf packet-count {\r
-                            type uint64;\r
-                        }\r
-                        leaf byte-count {\r
-                            type uint64;\r
-                        }\r
-                        leaf flow-count {\r
-                            type uint32;\r
+                    case multipart-request-table-case {\r
+                        container multipart-request-table {\r
+                            leaf empty {\r
+                                type empty;\r
+                            }\r
                         }\r
                     }\r
-                    case multipart-reply-table {\r
-                        list table-stats {\r
-                            leaf table-id {\r
-                                type uint8;\r
-                            }\r
-                            leaf active-count {\r
+                    case multipart-request-port-stats-case {\r
+                        container multipart-request-port-stats {\r
+                            leaf port-no {\r
                                 type uint32;\r
                             }\r
-                            leaf lookup-count {\r
-                                type uint64;\r
-                            }\r
-                            leaf matched-count {\r
-                                type uint64;\r
-                            }\r
                         }\r
                     }\r
-                    case multipart-reply-port-stats {\r
-                        list port-stats {\r
+                    case multipart-request-queue-case {\r
+                        container multipart-request-queue {\r
                             leaf port-no {\r
                                 type uint32;\r
                             }\r
-                            leaf rx-packets {\r
-                                type uint64;\r
-                            }\r
-                            leaf tx-packets {\r
-                                type uint64;\r
-                            }\r
-                            leaf rx-bytes {\r
-                                type uint64;\r
-                            }\r
-                            leaf tx-bytes {\r
-                                type uint64;\r
-                            }\r
-                            leaf rx-dropped {\r
-                                type uint64;\r
-                            }\r
-                            leaf tx-dropped {\r
-                                type uint64;\r
+                            leaf queue-id {\r
+                                type uint32;\r
                             }\r
-                            leaf rx-errors {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-group-case {\r
+                        container multipart-request-group {\r
+                            leaf group-id {\r
+                                type oft:group-id;\r
                             }\r
-                            leaf tx-errors {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-group-desc-case {\r
+                        container multipart-request-group-desc {\r
+                            leaf empty {\r
+                                type empty;\r
                             }\r
-                            leaf rx-frame-err {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-group-features-case {\r
+                        container multipart-request-group-features {\r
+                            leaf empty {\r
+                                type empty;\r
                             }\r
-                            leaf rx-over-err {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-meter-case {\r
+                        container multipart-request-meter {\r
+                            leaf meter-id {\r
+                                type oft:meter-id;\r
                             }\r
-                            leaf rx-crc-err {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-meter-config-case {\r
+                        container multipart-request-meter-config {\r
+                            leaf meter-id {\r
+                                type oft:meter-id;\r
                             }\r
-                            leaf collisions {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-request-meter-features-case {\r
+                        container multipart-request-meter-features {\r
+                            leaf empty {\r
+                                type empty;\r
                             }\r
-                            leaf duration-sec {\r
-                                type uint32;\r
+                        }\r
+                    }\r
+                    case multipart-request-table-features-case {\r
+                        container multipart-request-table-features {\r
+                            list table-features {\r
+                                leaf table-id {\r
+                                    type uint8;\r
+                                }\r
+                                leaf name {\r
+                                    type string;\r
+                                }\r
+                                leaf metadata-match {\r
+                                    type uint64;\r
+                                }\r
+                                leaf metadata-write {\r
+                                    type uint64;\r
+                                }\r
+                                leaf config {\r
+                                    type oft:table-config;\r
+                                }\r
+                                leaf max-entries {\r
+                                    type uint32;\r
+                                }\r
+                                uses table-features-properties;\r
                             }\r
-                            leaf duration-nsec {\r
-                                type uint32;\r
+                        }\r
+                    }\r
+                    case multipart-request-port-desc-case {\r
+                        container multipart-request-port-desc {\r
+                            leaf empty {\r
+                                type empty;\r
                             }\r
                         }\r
                     }\r
-                    case multipart-reply-queue {\r
-                        list queue-stats {\r
-                            leaf port-no {\r
+                    case multipart-request-experimenter-case {\r
+                        container multipart-request-experimenter {\r
+                            leaf experimenter {\r
                                 type uint32;\r
                             }\r
-                            leaf queue-id {\r
+                            leaf exp-type {\r
                                 type uint32;\r
                             }\r
-                            leaf tx-bytes {\r
-                                type uint64;\r
+                            leaf data {\r
+                                type binary;\r
                             }\r
-                            leaf tx-packets {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                }\r
+            } \r
+            grouping multipart-reply {\r
+                // reference "OFPT_MULTIPART_REPLY message in Openflow Switch 1.3 Spec"\r
+                /* Controller/switch message */\r
+\r
+                uses ofHeader;\r
+                \r
+                leaf type {\r
+                    type oft:multipart-type;\r
+                }\r
+                leaf flags {\r
+                    type oft:multipart-request-flags;\r
+                }\r
+                choice multipart-reply-body {\r
+                    case multipart-reply-desc-case {\r
+                        container multipart-reply-desc {\r
+                            leaf mfr_desc {\r
+                                type string;\r
                             }\r
-                            leaf tx-errors {\r
-                                type uint64;\r
+                            leaf hw_desc {\r
+                                type string;\r
                             }\r
-                            leaf duration-sec {\r
-                                type uint32;\r
+                            leaf sw_desc {\r
+                                type string;\r
                             }\r
-                            leaf duration-nsec {\r
-                                type uint32;\r
+                            leaf serial_num {\r
+                                type string;\r
+                            }\r
+                            leaf dp_desc {\r
+                                type string;\r
                             }\r
                         }\r
                     }\r
-                    case multipart-reply-group {\r
-                        list group-stats {\r
-                            leaf group-id {\r
-                                type uint32;\r
-                            }\r
-                            leaf ref-count {\r
-                                type uint32;\r
+                    case multipart-reply-flow-case {\r
+                        container multipart-reply-flow {\r
+                            list flow-stats {\r
+                                leaf table-id {\r
+                                    type uint8;\r
+                                }\r
+                                leaf duration-sec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf duration-nsec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf priority {\r
+                                    type uint16;\r
+                                }\r
+                                leaf idle-timeout {\r
+                                    type uint16;\r
+                                }\r
+                                leaf hard-timeout {\r
+                                    type uint16;\r
+                                }\r
+                                leaf flags {\r
+                                    type oft:flow-mod-flags;\r
+                                }\r
+                                leaf cookie {\r
+                                    type uint64;\r
+                                }\r
+                                leaf packet-count {\r
+                                    type uint64;\r
+                                }\r
+                                leaf byte-count {\r
+                                    type uint64;\r
+                                }\r
+                                uses match-grouping;\r
+                                \r
+                                uses ofinstruction:instructions;\r
+                                \r
+                                // OF1.0 structures\r
+                                uses oxm:match-v10-grouping;\r
+                                uses ofaction:actions;\r
                             }\r
+                        }\r
+                    }\r
+                    case multipart-reply-aggregate-case {\r
+                        container multipart-reply-aggregate {\r
                             leaf packet-count {\r
                                 type uint64;\r
                             }\r
                             leaf byte-count {\r
                                 type uint64;\r
                             }\r
-                            leaf duration-sec {\r
-                                type uint32;\r
-                            }\r
-                            leaf duration-nsec {\r
+                            leaf flow-count {\r
                                 type uint32;\r
                             }\r
-                            list bucket-stats {\r
-                                leaf packet-count {\r
+                        }\r
+                    }\r
+                    case multipart-reply-table-case {\r
+                        container multipart-reply-table {\r
+                            list table-stats {\r
+                                leaf table-id {\r
+                                    type uint8;\r
+                                }\r
+                                leaf active-count {\r
+                                    type uint32;\r
+                                }\r
+                                leaf lookup-count {\r
                                     type uint64;\r
                                 }\r
-                                leaf byte-count {\r
+                                leaf matched-count {\r
                                     type uint64;\r
                                 }\r
+                                \r
+                                // OF1.0 structures\r
+                                leaf name {\r
+                                    type string;\r
+                                }\r
                             }\r
                         }\r
                     }\r
-                    case multipart-reply-group-desc {\r
-                        list group-desc {\r
-                            leaf type {\r
-                                //type uint8;\r
-                                type oft:group-type;\r
-                            }\r
-                            leaf group-id {\r
-                                type uint32;\r
+                    case multipart-reply-port-stats-case {\r
+                        container multipart-reply-port-stats {\r
+                            list port-stats {\r
+                                leaf port-no {\r
+                                    type uint32;\r
+                                }\r
+                                leaf rx-packets {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-packets {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-bytes {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-bytes {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-dropped {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-dropped {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-errors {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-errors {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-frame-err {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-over-err {\r
+                                    type uint64;\r
+                                }\r
+                                leaf rx-crc-err {\r
+                                    type uint64;\r
+                                }\r
+                                leaf collisions {\r
+                                    type uint64;\r
+                                }\r
+                                leaf duration-sec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf duration-nsec {\r
+                                    type uint32;\r
+                                }\r
                             }\r
-                            uses buckets;\r
                         }\r
                     }\r
-                    case multipart-reply-group-features {\r
-                        leaf types {\r
-                            type oft:group-types;\r
-                        }\r
-                        leaf capabilities {\r
-                            type oft:group-capabilities;\r
-                        }\r
-                        leaf-list max_groups {\r
-                            type uint32;\r
+                    case multipart-reply-queue-case {\r
+                        container multipart-reply-queue {\r
+                            list queue-stats {\r
+                                leaf port-no {\r
+                                    type uint32;\r
+                                }\r
+                                leaf queue-id {\r
+                                    type uint32;\r
+                                }\r
+                                leaf tx-bytes {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-packets {\r
+                                    type uint64;\r
+                                }\r
+                                leaf tx-errors {\r
+                                    type uint64;\r
+                                }\r
+                                leaf duration-sec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf duration-nsec {\r
+                                    type uint32;\r
+                                }\r
+                            }\r
                         }\r
-                        \r
-                        uses ofaction:actions;\r
                     }\r
-                    case multipart-reply-meter {\r
-                        list meter-stats {\r
-                            leaf meter-id {\r
-                                type uint32;\r
+                    case multipart-reply-group-case {\r
+                        container multipart-reply-group {\r
+                            list group-stats {\r
+                                leaf group-id {\r
+                                    type oft:group-id;\r
+                                }\r
+                                leaf ref-count {\r
+                                    type uint32;\r
+                                }\r
+                                leaf packet-count {\r
+                                    type uint64;\r
+                                }\r
+                                leaf byte-count {\r
+                                    type uint64;\r
+                                }\r
+                                leaf duration-sec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf duration-nsec {\r
+                                    type uint32;\r
+                                }\r
+                                list bucket-stats {\r
+                                    leaf packet-count {\r
+                                        type uint64;\r
+                                    }\r
+                                    leaf byte-count {\r
+                                        type uint64;\r
+                                    }\r
+                                }\r
                             }\r
-                            leaf flow-count {\r
-                                type uint32;\r
+                        }\r
+                    }\r
+                    case multipart-reply-group-desc-case {\r
+                        container multipart-reply-group-desc {\r
+                            list group-desc {\r
+                                leaf type {\r
+                                    type oft:group-type;\r
+                                }\r
+                                leaf group-id {\r
+                                    type oft:group-id;\r
+                                }\r
+                                uses buckets;\r
                             }\r
-                            leaf packet-in-count {\r
-                                type uint64;\r
+                        }\r
+                    }\r
+                    case multipart-reply-group-features-case {\r
+                        container multipart-reply-group-features {\r
+                            leaf types {\r
+                                type oft:group-types;\r
                             }\r
-                            leaf byte-in-count {\r
-                                type uint64;\r
+                            leaf capabilities {\r
+                                type oft:group-capabilities;\r
                             }\r
-                            leaf duration-sec {\r
+                            leaf-list max_groups {\r
                                 type uint32;\r
                             }\r
-                            leaf duration-nsec {\r
-                                type uint32;\r
+                            leaf-list actions-bitmap {\r
+                                type oft:action-type;\r
                             }\r
-                            list meter-band-stats {\r
-                                leaf packet-band-count {\r
+                        }\r
+                    }\r
+                    case multipart-reply-meter-case {\r
+                        container multipart-reply-meter {\r
+                            list meter-stats {\r
+                                leaf meter-id {\r
+                                    type oft:meter-id;\r
+                                }\r
+                                leaf flow-count {\r
+                                    type uint32;\r
+                                }\r
+                                leaf packet-in-count {\r
                                     type uint64;\r
                                 }\r
-                                leaf byte-band-count {\r
+                                leaf byte-in-count {\r
                                     type uint64;\r
                                 }\r
+                                leaf duration-sec {\r
+                                    type uint32;\r
+                                }\r
+                                leaf duration-nsec {\r
+                                    type uint32;\r
+                                }\r
+                                list meter-band-stats {\r
+                                    leaf packet-band-count {\r
+                                        type uint64;\r
+                                    }\r
+                                    leaf byte-band-count {\r
+                                        type uint64;\r
+                                    }\r
+                                }\r
                             }\r
                         }\r
                     }\r
-                    case multipart-reply-meter-config {\r
-                        list meter-config {\r
-                            leaf flags {\r
-                                type oft:meter-mod-command;\r
-                            }\r
-                            leaf meter-id {\r
-                                type uint32;\r
-                            }\r
-                            list bands {\r
-                                uses meter-band-header;\r
+                    case multipart-reply-meter-config-case {\r
+                        container multipart-reply-meter-config {\r
+                            list meter-config {\r
+                                leaf flags {\r
+                                    type oft:meter-flags;\r
+                                }\r
+                                leaf meter-id {\r
+                                    type oft:meter-id;\r
+                                }\r
+                                list bands {\r
+                                    uses meter-band-header;\r
+                                }\r
                             }\r
                         }\r
                     }\r
-                    case multipart-reply-meter-features {\r
-                        leaf max-meter {\r
-                            type uint32;\r
-                        }\r
-                        leaf band-types {\r
-                            type oft:meter-band-type;\r
-                        }\r
-                        leaf capabilities {\r
-                            type oft:meter-flags;\r
-                        }\r
-                        leaf max-bands {\r
-                            type uint8;\r
-                        }\r
-                        leaf max-color {\r
-                            type uint8;\r
-                        }\r
-                    }\r
-                    case multipart-reply-table-features {\r
-                        list table-features {\r
-                            leaf table-id {\r
-                                type uint8;\r
+                    case multipart-reply-meter-features-case {\r
+                        container multipart-reply-meter-features {\r
+                            leaf max-meter {\r
+                                type uint32;\r
                             }\r
-                            leaf name {\r
-                                type string;\r
+                            leaf band-types {\r
+                                type oft:meter-band-type-bitmap;\r
                             }\r
-                            leaf metadata-match {\r
-                                type binary;\r
+                            leaf capabilities {\r
+                                type oft:meter-flags;\r
                             }\r
-                            leaf metadata-write {\r
-                                type binary;\r
+                            leaf max-bands {\r
+                                type uint8;\r
                             }\r
-                            leaf config {\r
-                                type oft:port-config;\r
-                            } \r
-                            leaf max-entries {\r
-                                type uint32;\r
+                            leaf max-color {\r
+                                type uint8;\r
                             }\r
-                            uses table-features-properties;\r
                         }\r
                     }\r
-                    case multipart-reply-port-desc {\r
-                        list ports {\r
-                            uses port;\r
+                    case multipart-reply-table-features-case {\r
+                        container multipart-reply-table-features {\r
+                            list table-features {\r
+                                leaf table-id {\r
+                                    type uint8;\r
+                                }\r
+                                leaf name {\r
+                                    type string;\r
+                                }\r
+                                leaf metadata-match {\r
+                                    type binary;\r
+                                }\r
+                                leaf metadata-write {\r
+                                    type binary;\r
+                                }\r
+                                leaf config {\r
+                                    type oft:table-config;\r
+                                } \r
+                                leaf max-entries {\r
+                                    type uint32;\r
+                                }\r
+                                uses table-features-properties;\r
+                            }\r
                         }\r
                     }\r
-                    case multipart-reply-experimenter {\r
-                        leaf experimenter {\r
-                            type uint32;\r
-                        }\r
-                        leaf exp-type {\r
-                            type uint32;\r
+                    case multipart-reply-port-desc-case {\r
+                        container multipart-reply-port-desc {\r
+                            list ports {\r
+                                uses port;\r
+                            }\r
                         }\r
-                        leaf data {\r
-                            type binary;\r
+                    }\r
+                    case multipart-reply-experimenter-case {\r
+                        container multipart-reply-experimenter {\r
+                            leaf experimenter {\r
+                                type uint32;\r
+                            }\r
+                            leaf exp-type {\r
+                                type uint32;\r
+                            }\r
+                            leaf data {\r
+                                type binary;\r
+                            }\r
                         }\r
                     }\r
                 }\r
@@ -946,7 +1108,7 @@ module openflow-protocol {
                 list queues {\r
                     uses packet-queue;\r
                 }\r
-            } \r
+            }\r
             grouping packet-queue {\r
                 leaf queue-id {\r
                     type oft:queue-id;\r
@@ -954,13 +1116,17 @@ module openflow-protocol {
                 leaf port {\r
                     type oft:port-number;\r
                 }\r
-                list properties {\r
-                    uses queue-property-header;\r
-                }\r
+                uses queue-property-header;\r
+            }\r
+            container queue-prop-container {\r
+                uses queue-property-header;\r
             }\r
             grouping queue-property-header {\r
-                leaf property {\r
-                    type oft:queue-property;\r
+                list queue-property {\r
+                    key "property";\r
+                    leaf property {\r
+                        type oft:queue-properties;\r
+                    }\r
                 }\r
             }\r
             /* Controller role change request messages. */\r
@@ -1002,7 +1168,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
@@ -1018,23 +1194,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
@@ -1047,30 +1207,36 @@ module openflow-protocol {
                 } \r
                 leaf flags {\r
                     type oft:meter-flags;\r
-                }            \r
+                }\r
                 leaf meter-id {\r
                     type oft:meter-id;\r
-                }   \r
+                }\r
                 list bands {\r
                     uses meter-band-header;\r
                 }\r
-            } \r
+            }\r
             \r
             grouping meter-band-header {\r
                 choice meter-band {\r
-                    case meter-band-drop {\r
-                        uses meter-band-commons;\r
+                    case meter-band-drop-case {\r
+                        container meter-band-drop {\r
+                            uses meter-band-commons;\r
+                        }\r
                     }\r
-                    case meter-band-dscp-remark {\r
-                        uses meter-band-commons;\r
-                        leaf prec-level {\r
-                            type uint8;\r
+                    case meter-band-dscp-remark-case {\r
+                        container meter-band-dscp-remark {\r
+                            uses meter-band-commons;\r
+                            leaf prec-level {\r
+                                type uint8;\r
+                            }\r
                         }\r
                     }\r
-                    case meter-band-experimenter {\r
-                        uses meter-band-commons;\r
-                        leaf experimenter {\r
-                            type uint32;\r
+                    case meter-band-experimenter-case {\r
+                        container meter-band-experimenter {\r
+                            uses meter-band-commons;\r
+                            leaf experimenter {\r
+                                type uint32;\r
+                            }\r
                         }\r
                     }\r
                 }\r
@@ -1233,17 +1399,18 @@ module openflow-protocol {
             } /* Controller/switch message */\r
 \r
         /* Multipart messages. */\r
-            //FIXME: Arent this wire protocol specific?\r
 \r
-            notification multipart-request-message {\r
-                uses multipart-request;\r
-                // reference "OFPT_MULTIPART_REQUEST message in Openflow Switch 1.3 Spec"\r
-                \r
-            } /* Controller/switch message */\r
+            rpc multipart-request {\r
+                input {\r
+                    uses multipart-request;\r
+                }\r
+            }\r
+\r
+             /* Controller/switch message */\r
             notification multipart-reply-message {\r
                 uses multipart-reply;\r
                 // reference "OFPT_MULTIPART_REPLY message in Openflow Switch 1.3 Spec"\r
-                \r
+                // notification because of multiple following responses\r
             } /* Controller/switch message */\r
             \r
 \r