Bug 6674 - the key of the serialization function registered by the vendor is not...

[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
old mode 100644 (file)
new mode 100755 (executable)
index 292bd96..4a60c37
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -21,7 +21,7 @@
     import openflow-extensible-match {prefix oxm;}
 
     revision "2015-02-25" {
-        description "OpenFlow 1.3 - augments model.
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - augments model.
                     Please visit
                     https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
                      - Augmentation Tables chapter";
@@ -89,35 +89,13 @@
      }
 
 // OFP_INSTRUCTION AUGMENTS
-     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
-         ext:augment-identifier "table-id-instruction";
-         leaf table-id {
-             type uint8;
-         }
-     }
-     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
-         ext:augment-identifier "metadata-instruction";
-         leaf metadata {
-             type binary;
-         }
-         leaf metadata-mask {
-             type binary;
-         }
-     }
-     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
-         ext:augment-identifier "actions-instruction";
-         uses ofaction:actions-grouping;
-     }
-     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
-         ext:augment-identifier "meter-id-instruction";
-         leaf meter-id {
-             type uint32;
-         }
-     }
-     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
-         ext:augment-identifier "experimenter-id-instruction";
-         leaf experimenter {
-             type oft:experimenter-id;
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction-choice" {
+         case experimenter-id-case {
+             container experimenter {
+                 leaf experimenter-id {
+                     type oft:experimenter-id;
+                 }
+             }
          }
      }
 
@@ -143,31 +121,16 @@
          }
      }
 
-// 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;
-         }
-     }
-     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;
          }
+         leaf sub-type {
+             type identityref {
+                 base oft:experimenter-meter-band-sub-type;
+             }
+         }
      }
-}
\ No newline at end of file
+}