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=f443120f293584e2c373167d3e54d71fd43f2142;hpb=03b554b297bf67704cff0db83ac3c1740c4c9423;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 f443120f..44986927 100644
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -1,4 +1,12 @@
-module openflow-augments {
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+ 
+ module openflow-augments {
     namespace "urn:opendaylight:openflow:augments";
     prefix "aug";
     
@@ -13,7 +21,10 @@ module openflow-augments {
     import openflow-extensible-match {prefix oxm;}
 
     revision "2013-10-02" {
-        description "OpenFlow 1.3 - augments model";
+        description "OpenFlow 1.3 - augments model. 
+                    Please visit 
+                    https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
+                     - Augmentation Tables chapter";
     }
 
 // OFP_MATCH AUGMENTS
@@ -161,44 +172,31 @@ module openflow-augments {
      augment "/oxm:oxm-container/oxm:match-entries" {
          ext:augment-identifier "pseudo-field-match-entry";
          leaf pseudo-field {
-             type bits {
-                 bit nonext {
-                     description "<No next header> encountered.";
-                     position 0;
-                 }
-                 bit esp {
-                     description "Encrypted Sec Payload header present.";
-                     position 1;
-                 }
-                 bit auth {
-                     description "Authentication header present.";
-                     position 2;
-                 }
-                 bit dest {
-                     description "1 or 2 dest headers present.";
-                     position 3;
-                 }
-                 bit frag {
-                     description "Fragment header present.";
-                     position 4;
-                 }
-                 bit router {
-                     description "Router header present.";
-                     position 5;
-                 }
-                 bit hop {
-                     description "Hop-by-hop header present.";
-                     position 6;
-                 }
-                 bit unrep {
-                     description "Unexpected repeats encountered.";
-                     position 7;
-                 }
-                 bit unseq {
-                     description "Unexpected sequencing encountered.";
-                     position 8;
-                 }
-             }
+             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;
          }
      }
 
@@ -247,25 +245,58 @@ module openflow-augments {
      }
      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:action" {
          ext:augment-identifier "experimenter-action";
          leaf experimenter {
              type uint32;
          }
+         leaf data {
+             type binary;
+         }
+     }
+     // 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;
+         }
      }
 
 // OFP_TABLE_FEATURES_PROPERTIES AUGMENTS
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "instruction-related-table-feature-property";
-         list instruction-ids {
-             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 {
+             config false;
              leaf table-id {
                  type uint8;
              }
@@ -273,15 +304,11 @@ module openflow-augments {
      }
      augment "/ofproto:table-features-properties-container/ofproto:table-feature-properties" {
          ext:augment-identifier "action-related-table-feature-property";
-         list action-ids {
-             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";
-         list oxm-ids {
-             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 @@ module openflow-augments {
      }
 
 // 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 @@ module openflow-augments {
              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;
@@ -331,4 +358,36 @@ module openflow-augments {
              type binary;
          }
      }
+     
+// OFP_QUEUE_PROP AUGMENTS
+     augment "/ofproto:queue-prop-container/ofproto:queue-property" {
+         ext:augment-identifier "rate-queue-property";
+         leaf rate {
+             type uint16;
+         }
+     }
+     augment "/ofproto:queue-prop-container/ofproto:queue-property" {
+         ext:augment-identifier "experimenter-queue-property";
+         leaf experimenter {
+             type uint32;
+         }
+         leaf data {
+             type binary;
+         }
+     }
+     
+// OFP_ERROR_AUGMENTS (only experimenter till OpenFlow v1.3)
+    augment "/ofproto:error-message" {
+         ext:augment-identifier "experimenter-error";
+         leaf exp_type {
+             type uint16;
+         }
+         leaf experimenter {
+             type uint32;
+         }
+         leaf exp-data {
+             type binary;
+         }
+     }
+
 }
\ No newline at end of file