Merge "Bug 1245: Dropped Binding prefix from Binding Data APIs."

[controller.git] / opendaylight / md-sal / model / model-flow-base / src / main / yang / opendaylight-match-types.yang

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
index 321e0540974e3ccc5838e1638e251d6e47fd4b26..deff6f17984cce55c8bcf97b43159f42852ebfec 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
@@ -8,7 +8,7 @@ module opendaylight-match-types {
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
 
     revision "2013-10-26" {
-        description "Initial revision of macth types";
+        description "Initial revision of match types";
     }
 
     grouping "mac-address-filter" {
@@ -269,6 +269,23 @@ module opendaylight-match-types {
         }
     }
 
+    grouping "tcp-flag-match-fields" {
+        leaf tcp-flag {
+            type uint16;
+        }
+    }
+
+    grouping "tunnel-ipv4-match-fields" {
+        leaf tunnel-ipv4-source {
+            description "IPv4 source tunnel endpoint address.";
+            type inet:ipv4-prefix;
+        }
+        leaf tunnel-ipv4-destination {
+            description "IPv4 destination tunnel endpoint address.";
+            type inet:ipv4-prefix;
+        }
+    }
+
     grouping match {
         leaf in-port {
             type inv:node-connector-id;
@@ -315,6 +332,9 @@ module opendaylight-match-types {
             case "arp-match" {
                 uses "arp-match-fields";
             }
+            case "tunnel-ipv4-match" {
+                uses "tunnel-ipv4-match-fields";
+            }
         }
 
         choice layer-4-match {
@@ -340,5 +360,9 @@ module opendaylight-match-types {
         container "protocol-match-fields" {
             uses "protocol-match-fields";
         }
+
+        container tcp-flag-match {
+            uses "tcp-flag-match-fields";
+        }
     }
 }
\ No newline at end of file