BUG-9223:Remove hardcoded value of lldp interval

[openflowplugin.git] / model / model-flow-base / src / main / yang / opendaylight-match-types.yang

diff --git a/model/model-flow-base/src/main/yang/opendaylight-match-types.yang b/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
index 332f27e613ea696f08d2f9981e52817c6f4418bb..3c6d79ab2ccb0f269ffa7ad679bc8651c29fd728 100644 (file)
--- a/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
+++ b/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
@@ -2,11 +2,12 @@ module opendaylight-match-types {
     namespace "urn:opendaylight:model:match:types";
     prefix "match";
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
+    import ietf-inet-types {prefix inet; revision-date "2013-07-15";}
+    import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
     import opendaylight-l2-types {prefix l2t;revision-date "2013-08-27";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-arbitrary-bitmask-fields {prefix mask; revision-date "2016-01-30";}
+    import opendaylight-ipv6-arbitrary-bitmask-fields {prefix ipv6-arbitrary-mask; revision-date "2016-02-24";}
 
     revision "2013-10-26" {
         description "Initial revision of match types";
@@ -270,8 +271,13 @@ module opendaylight-match-types {
         }
     }
 
-    grouping "tcp-flag-match-fields" {
-        leaf tcp-flag {
+    grouping "tcp-flags-match-fields" {
+        leaf tcp-flags {
+            description "Tcp flags for match";
+            type uint16;
+        }
+        leaf tcp-flags-mask {
+            description "Mask for tcp flags";
             type uint16;
         }
     }
@@ -333,6 +339,9 @@ module opendaylight-match-types {
             case "ipv6-match" {
                 uses "ipv6-match-fields";
             }
+            case "ipv6-match-arbitrary-bit-mask"{
+                uses ipv6-arbitrary-mask:ipv6-match-arbitrary-bitmask-fields;
+            }
             case "arp-match" {
                 uses "arp-match-fields";
             }
@@ -365,8 +374,8 @@ module opendaylight-match-types {
             uses "protocol-match-fields";
         }
 
-        container tcp-flag-match {
-            uses "tcp-flag-match-fields";
+        container tcp-flags-match {
+            uses "tcp-flags-match-fields";
         }
     }
-}
\ No newline at end of file
+}