Created experimenter subtype for vendor's actions

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

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index ed6d01d15c23d1735544821bbeefd2fc2b110abd..a2e69293ca6eb6c66e3e27a292ffbf4f7ff85bb1 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -175,6 +175,12 @@
              type oft:ipv6-exthdr-flags;\r
          }\r
      }\r
+     augment "/oxm:oxm-container/oxm:match-entries" {\r
+         ext:augment-identifier "experimenter-id-match-entry";\r
+         leaf experimenter {\r
+             type oft:experimenter-id;\r
+         }\r
+     }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
          ext:augment-identifier "tcp-flag-match-entry";\r
          leaf tcp-flag {\r
@@ -242,12 +248,14 @@
          uses oxm:oxm-fields-grouping;\r
      }\r
      augment "/ofaction:actions-container/ofaction:action" {\r
-         ext:augment-identifier "experimenter-action";\r
+         ext:augment-identifier "experimenter-id-action";\r
          leaf experimenter {\r
-             type uint32;\r
+             type oft:experimenter-id;\r
          }\r
-         leaf data {\r
-             type binary;\r
+         leaf sub-type {\r
+            type identityref {\r
+                base ofaction:experimenter-action-sub-type;\r
+            }\r
          }\r
      }\r
      // OF1.0 structures\r
@@ -305,16 +313,13 @@
          uses oxm:oxm-fields-grouping;\r
      }\r
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {\r
-         ext:augment-identifier "experimenter-related-table-feature-property";\r
+         ext:augment-identifier "experimenter-id-table-feature-property";\r
          leaf experimenter {\r
-             type uint32;\r
+             type oft:experimenter-id;\r
          }\r
          leaf exp-type {\r
              type uint32;\r
          }\r
-         leaf data {\r
-             type binary;\r
-         }\r
      }\r
 \r
 // OFP_INSTRUCTION AUGMENTS\r
@@ -344,12 +349,9 @@
          }\r
      }\r
      augment "/ofinstruction:instruction-container/ofinstruction:instruction" {\r
-         ext:augment-identifier "experimenter-instruction";\r
+         ext:augment-identifier "experimenter-id-instruction";\r
          leaf experimenter {\r
-             type uint32;\r
-         }\r
-         leaf data {\r
-             type binary;\r
+             type oft:experimenter-id;\r
          }\r
      }\r
      \r
@@ -361,27 +363,45 @@
          }\r
      }\r
      augment "/ofproto:queue-prop-container/ofproto:queue-property" {\r
-         ext:augment-identifier "experimenter-queue-property";\r
+         ext:augment-identifier "experimenter-id-queue-property";\r
          leaf experimenter {\r
-             type uint32;\r
-         }\r
-         leaf data {\r
-             type binary;\r
+             type oft:experimenter-id;\r
          }\r
      }\r
      \r
 // OFP_ERROR_AUGMENTS (only experimenter till OpenFlow v1.3)\r
-    augment "/ofproto:error-message" {\r
-         ext:augment-identifier "experimenter-error";\r
-         leaf exp_type {\r
-             type uint16;\r
+     augment "/ofproto:error-message" {\r
+         ext:augment-identifier "experimenter-id-error";\r
+         leaf experimenter {\r
+             type oft:experimenter-id;\r
          }\r
+     }\r
+\r
+// OFP_MULTIPART AUGMENTS\r
+     augment "/ofproto:multipart-request/input/ofproto:multipart-request-body/ofproto:multipart-request-experimenter-case/ofproto:multipart-request-experimenter" {\r
+         ext:augment-identifier "experimenter-id-multipart-request";\r
          leaf experimenter {\r
+             type oft:experimenter-id;\r
+         }\r
+         leaf exp-type {\r
              type uint32;\r
          }\r
-         leaf data {\r
-             type binary; \r
+     }\r
+     augment "/ofproto:multipart-reply-message/ofproto:multipart-reply-body/ofproto:multipart-reply-experimenter-case/ofproto:multipart-reply-experimenter" {\r
+         ext:augment-identifier "experimenter-id-multipart-reply";\r
+         leaf experimenter {\r
+             type oft:experimenter-id;\r
+         }\r
+         leaf exp-type {\r
+             type uint32;\r
          }\r
      }\r
 \r
+// OFP_METER_BAND AUGMENTS\r
+     augment "/ofproto:meter-band-container/ofproto:meter-band/ofproto:meter-band-experimenter-case/ofproto:meter-band-experimenter" {\r
+         ext:augment-identifier "experimenter-id-meter-band";\r
+         leaf experimenter {\r
+             type oft:experimenter-id;\r
+         }\r
+     }\r
 }
\ No newline at end of file