Updated experimenter model

[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 44986927df0393ebb05dbcff7d6ee2aa841af887..910dfa5fe0fd97eb049983fcc9b3a7f0fa5ec451 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -176,9 +176,9 @@
          }\r
      }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
-         ext:augment-identifier "experimenter-match-entry";\r
+         ext:augment-identifier "experimenter-id-match-entry";\r
          leaf experimenter {\r
-             type uint32;\r
+             type oft:experimenter-id;\r
          }\r
      }\r
      augment "/oxm:oxm-container/oxm:match-entries" {\r
@@ -248,12 +248,9 @@
          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
-         }\r
-         leaf data {\r
-             type binary;\r
+             type oft:experimenter-id;\r
          }\r
      }\r
      // OF1.0 structures\r
@@ -311,16 +308,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
@@ -350,12 +344,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
@@ -367,27 +358,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 exp-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