X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-augments.yang;h=44986927df0393ebb05dbcff7d6ee2aa841af887;hb=60ad94454217d7d1f6f9e65f39f72ae111ecc845;hp=a0ac66a5f6db360c84254f488a69b0c63d873b61;hpb=d85c80c60aedb20c472dda502e8ffcaa6a5669d0;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 a0ac66a5..44986927 100644
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -175,86 +175,113 @@
              type oft:ipv6-exthdr-flags;
          }
      }
+     augment "/oxm:oxm-container/oxm:match-entries" {
+         ext:augment-identifier "experimenter-match-entry";
+         leaf experimenter {
+             type uint32;
+         }
+     }
+     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;
+         }
+     }
 
 // OFP_ACTION AUGMENTS
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "port-action";
          leaf port {
              type oft:port-number;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "max-length-action";
          leaf max-length {
              type uint16;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "mpls-ttl-action";
          leaf mpls-ttl {
              type uint8;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "ethertype-action";
          leaf ethertype {
              type oft:ether-type;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "queue-id-action";
          leaf queue-id {
              type uint32;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "group-id-action";
          leaf group-id {
              type uint32;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "nw-ttl-action";
          leaf nw-ttl {
              type uint8;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "oxm-fields-action";
-         uses oxm:oxm-fields;
+         uses oxm:oxm-fields-grouping;
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "experimenter-action";
          leaf experimenter {
              type uint32;
          }
+         leaf data {
+             type binary;
+         }
      }
      // OF1.0 structures
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "vlan-vid-action";
          leaf vlan-vid {
              type uint16;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "vlan-pcp-action";
          leaf vlan-pcp {
              type uint8;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "dl-address-action";
          leaf dl-address {
              type yang:mac-address;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "nw-tos-action";
          leaf nw-tos {
              type uint8;
          }
      }
-     augment "/ofaction:actions-container/ofaction:actions-list/ofaction:action" {
+     augment "/ofaction:actions-container/ofaction:action" {
          ext:augment-identifier "ip-address-action";
          leaf ip-address {
              type inet:ipv4-address;
@@ -264,12 +291,12 @@
 // OFP_TABLE_FEATURES_PROPERTIES AUGMENTS
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "instruction-related-table-feature-property";
-         uses ofinstruction:instructions;
+         uses ofinstruction:instructions-grouping;
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "next-table-related-table-feature-property";
          list next-table-ids {
-             key "table-id";
+             config false;
              leaf table-id {
                  type uint8;
              }
@@ -277,11 +304,11 @@
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "action-related-table-feature-property";
-         uses ofaction:actions;
+         uses ofaction:actions-grouping;
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "oxm-related-table-feature-property";
-         uses oxm:oxm-fields;
+         uses oxm:oxm-fields-grouping;
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "experimenter-related-table-feature-property";
@@ -297,13 +324,13 @@
      }
 
 // OFP_INSTRUCTION AUGMENTS
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          ext:augment-identifier "table-id-instruction";
          leaf table-id {
              type uint8;
          }
      }
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          ext:augment-identifier "metadata-instruction";
          leaf metadata {
              type binary;
@@ -312,17 +339,17 @@
              type binary;
          }
      }
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          ext:augment-identifier "actions-instruction";
-         uses ofaction:actions;
+         uses ofaction:actions-grouping;
      }
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          ext:augment-identifier "meter-id-instruction";
          leaf meter-id {
              type uint32;
          }
      }
-     augment "/ofinstruction:instruction-container/ofinstruction:instructions" {
+     augment "/ofinstruction:instruction-container/ofinstruction:instruction" {
          ext:augment-identifier "experimenter-instruction";
          leaf experimenter {
              type uint32;
@@ -358,6 +385,9 @@
          leaf experimenter {
              type uint32;
          }
+         leaf exp-data {
+             type binary;
+         }
      }
 
 }
\ No newline at end of file