Added cachedThreadPool in ConnectionAdapter

[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 1b3d9b0deeecb7a380efb8dfaf2c56f098bc29b1..d9afe212e0e8b0667928c838ccd4c8f9061c7a7a 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -84,9 +84,19 @@ module openflow-protocol {
             uses oxm:oxm-fields;\r
         }\r
         \r
+        container table-features-properties-container {\r
+            uses table-features-properties;\r
+        }\r
         \r
+        grouping table-features-properties {\r
+            list table-feature-properties {\r
+                leaf type {\r
+                    type oft:table-features-prop-type;\r
+                }\r
+            }\r
+        }\r
 \r
-    // TODO: ofp_packat_queue\r
+    // TODO: ofp_packet_queue\r
 \r
     // # MESSAGE Structures\r
         /* Immutable messages. */\r
@@ -333,7 +343,7 @@ module openflow-protocol {
                 \r
                 uses ofHeader;\r
                 \r
-                list actions {\r
+                list actions-list {\r
                     uses ofaction:action-header;\r
                     \r
                     leaf data {\r
@@ -407,7 +417,7 @@ module openflow-protocol {
                     type uint32;\r
                 }\r
                 \r
-                list buckets {\r
+                list buckets-list {\r
                     uses bucket;\r
                 }\r
             }\r
@@ -421,8 +431,7 @@ module openflow-protocol {
                 leaf watch-group {\r
                     type uint32;\r
                 }\r
-                \r
-                list actions {\r
+                list actions-list {\r
                     uses ofaction:action-header;\r
                 }\r
             }\r
@@ -545,7 +554,7 @@ module openflow-protocol {
                         }\r
                     }\r
                     case multipart-request-table-features {\r
-                        list table_features {\r
+                        list table-features {\r
                             leaf table-id {\r
                                 type uint8;\r
                             }\r
@@ -564,6 +573,7 @@ module openflow-protocol {
                             leaf max-entries {\r
                                 type uint32;\r
                             }\r
+                            uses table-features-properties;\r
                         }\r
                     }\r
                     case multipart-request-experimenter {\r
@@ -627,7 +637,7 @@ module openflow-protocol {
                                 type uint16;\r
                             }\r
                             leaf flags {\r
-                                type uint16;\r
+                                type oft:flow-mod-flags;\r
                             }\r
                             leaf cookie {\r
                                 type uint64;\r
@@ -777,12 +787,13 @@ module openflow-protocol {
                     case multipart-reply-group-desc {\r
                         list group-desc {\r
                             leaf type {\r
-                                type uint8;\r
+                                //type uint8;\r
+                                type oft:group-type;\r
                             }\r
                             leaf group-id {\r
                                 type uint32;\r
                             }\r
-                            list buckets {\r
+                            list buckets-list {\r
                                 uses bucket;\r
                             }\r
                         }\r
@@ -800,7 +811,7 @@ module openflow-protocol {
                         //leaf-list actions {\r
                         //    type ofaction:action-type;\r
                         //}\r
-                        list actions {\r
+                        list actions-list {\r
                             uses ofaction:action-header;\r
                         }\r
                     }\r
@@ -898,6 +909,9 @@ module openflow-protocol {
                         leaf exp-type {\r
                             type uint32;\r
                         }\r
+                        leaf data {\r
+                            type binary;\r
+                        }\r
                     }\r
                 }\r
             } \r
@@ -1046,6 +1060,26 @@ module openflow-protocol {
             } \r
             \r
             grouping meter-band-header {\r
+                choice meter-band {\r
+                    case meter-band-drop {\r
+                        uses meter-band-commons;\r
+                    }\r
+                    case meter-band-dscp-remark {\r
+                        uses meter-band-commons;\r
+                        leaf prec-level {\r
+                            type uint8;\r
+                        }\r
+                    }\r
+                    case meter-band-experimenter {\r
+                        uses meter-band-commons;\r
+                        leaf experimenter {\r
+                            type uint32;\r
+                        }\r
+                    }\r
+                }\r
+            }\r
+            \r
+            grouping meter-band-commons {\r
                 leaf type {\r
                     type oft:meter-band-type;\r
                 }\r