VLAN bug fixes

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

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
index f58f6a459741e569578c5133b8e6d118e953d2a6..1ed1b6827bdc6ace925576b207b7d818d27ac8b5 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
@@ -9,7 +9,7 @@ module opendaylight-match-types {
     revision "2013-10-26" {
         description "Initial revision of macth types";
     }
-
+    
     grouping "mac-address-filter" {
         leaf address {
             mandatory true;
@@ -61,14 +61,14 @@ module opendaylight-match-types {
         container vlan-id {
             description "VLAN id.";
             presence "Match field is active and set";
-            
+
+            leaf vlan-id-present {
+                type boolean;
+            }
+                        
             leaf vlan-id {
-                mandatory true;
                 type l2t:vlan-id; 
             }
-            leaf mask {
-                type binary;
-            }
         }
         leaf vlan-pcp {
             description "VLAN priority.";
@@ -92,10 +92,10 @@ module opendaylight-match-types {
             type uint8; 
         }
         
-        leaf ip-proto {
-            description "IP Proto (IPv4 or IPv6 Protocol Number).";
-            type inet:ip-version; 
-        }
+        leaf ip-proto {                
+           description "IP Proto (IPv4 or IPv6 Protocol Number).";             
+              type inet:ip-version;            
+               }
     } 
     
     grouping "ipv4-match-fields" {
@@ -146,10 +146,16 @@ module opendaylight-match-types {
             description "Link layer target address for neighbour discovery message";
             type yang:mac-address;
         }
-            
-        leaf ipv6-exthdr {
-            description "IPv6 Extension Header field";
-            type uint16;
+        
+        container "ipv6-ext-header" {    
+            leaf ipv6-exthdr {
+                description "IPv6 Extension Header field";
+                type uint16;
+            }
+
+            leaf ipv6-exthdr-mask {
+                type binary;
+            }
         }
     }