X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-augments.yang;h=a2e69293ca6eb6c66e3e27a292ffbf4f7ff85bb1;hb=01a3e436f6947964998fcf9a9f50e68d13e63e05;hp=ed6d01d15c23d1735544821bbeefd2fc2b110abd;hpb=774bedf030142fd05a31e02b21c4079745cf83f0;p=openflowjava.git

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