X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-augments.yang;h=292bd96113008b193a9e23afdeff88d2f281dbe2;hb=5f5622e79402f70a944fa93fd7ee2d84d1776b08;hp=229d5f5ab9444d05c416c86e48e9a50183e2c3a1;hpb=07de1ed897da9d7dc70c6d550f38c59339ed751e;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 229d5f5a..292bd961 100644
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -20,7 +20,7 @@
     import openflow-instruction {prefix ofinstruction;}
     import openflow-extensible-match {prefix oxm;}
 
-    revision "2013-10-02" {
+    revision "2015-02-25" {
         description "OpenFlow 1.3 - augments model.
                     Please visit
                     https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
@@ -28,265 +28,31 @@
     }
 
 // OFP_MATCH AUGMENTS
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "port-number-match-entry";
-         leaf port-number {
-             type oft:port-number;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "metadata-match-entry";
-         leaf metadata {
-             type binary;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "mask-match-entry";
-         leaf mask {
-             type binary;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "mac-address-match-entry";
-         leaf mac-address {
-             type yang:mac-address;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "eth-type-match-entry";
-         leaf eth-type {
-             type oft:ether-type;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "vlan-vid-match-entry";
-         leaf vlan-vid {
-             type uint16;
-         }
-         leaf cfi-bit {
-             type boolean;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "vlan-pcp-match-entry";
-         leaf vlan-pcp {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "dscp-match-entry";
-         leaf dscp {
-             type inet:dscp;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "ecn-match-entry";
-         leaf ecn {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "protocol-number-match-entry";
-         leaf protocol-number {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "port-match-entry";
-         leaf port {
-             type inet:port-number;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "icmpv4-type-match-entry";
-         leaf icmpv4-type {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "icmpv4-code-match-entry";
-         leaf icmpv4-code {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "op-code-match-entry";
-         leaf op-code {
-             type uint16;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "ipv6-flabel-match-entry";
-         leaf ipv6-flabel {
-             type inet:ipv6-flow-label;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "icmpv6-type-match-entry";
-         leaf icmpv6-type {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "icmpv6-code-match-entry";
-         leaf icmpv6-code {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "ipv6-address-match-entry";
-         leaf ipv6-address {
-             type inet:ipv6-address;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "ipv4-address-match-entry";
-         leaf ipv4-address {
-             type inet:ipv4-address;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "mpls-label-match-entry";
-         leaf mpls-label {
-             type uint32;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "tc-match-entry";
-         leaf tc {
-             type uint8;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "bos-match-entry";
-         leaf bos {
-             type boolean;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "isid-match-entry";
-         leaf isid {
-             type uint32;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "pseudo-field-match-entry";
-         leaf pseudo-field {
-             type oft:ipv6-exthdr-flags;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
+     augment "/oxm:oxm-container/oxm:match-entry-value" {
          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 {
-             type uint16;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "tunnel-ipv4-dst-match-entry";
-         leaf tunnel-ipv4-dst {
-             type inet:ipv4-address;
-         }
-     }
-     augment "/oxm:oxm-container/oxm:match-entries" {
-         ext:augment-identifier "tunnel-ipv4-src-match-entry";
-         leaf tunnel-ipv4-src {
-             type inet:ipv4-address;
+         case experimenter-id-case {
+             container experimenter {
+                 leaf experimenter {
+                     type oft:experimenter-id;
+                 }
+             }
          }
      }
 
 // OFP_ACTION AUGMENTS
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "port-action";
-         leaf port {
-             type oft:port-number;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "max-length-action";
-         leaf max-length {
-             type uint16;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "mpls-ttl-action";
-         leaf mpls-ttl {
-             type uint8;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "ethertype-action";
-         leaf ethertype {
-             type oft:ether-type;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "queue-id-action";
-         leaf queue-id {
-             type uint32;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "group-id-action";
-         leaf group-id {
-             type uint32;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "nw-ttl-action";
-         leaf nw-ttl {
-             type uint8;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "oxm-fields-action";
-         uses oxm:oxm-fields-grouping;
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
+     augment "/ofaction:action-container/ofaction:action-choice" {
          ext:augment-identifier "experimenter-id-action";
-         leaf experimenter {
-             type oft:experimenter-id;
-         }
-         leaf sub-type {
-            type identityref {
-                base ofaction:experimenter-action-sub-type;
-            }
-         }
-     }
-     // OF1.0 structures
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "vlan-vid-action";
-         leaf vlan-vid {
-             type uint16;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "vlan-pcp-action";
-         leaf vlan-pcp {
-             type uint8;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "dl-address-action";
-         leaf dl-address {
-             type yang:mac-address;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "nw-tos-action";
-         leaf nw-tos {
-             type uint8;
-         }
-     }
-     augment "/ofaction:actions-container/ofaction:action" {
-         ext:augment-identifier "ip-address-action";
-         leaf ip-address {
-             type inet:ipv4-address;
+         case experimenter-id-case {
+             container experimenter {
+                 leaf experimenter {
+                     type oft:experimenter-id;
+                 }
+                 leaf sub-type {
+                     type identityref {
+                         base ofaction:experimenter-action-sub-type;
+                     }
+                 }
+             }
          }
      }
 
@@ -310,7 +76,7 @@
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "oxm-related-table-feature-property";
-         uses oxm:oxm-fields-grouping;
+         uses oxm:match-entries-grouping;
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "experimenter-id-table-feature-property";