VLAN bug fixes

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: Idc8d6a981781e738d3e7b587bba177fbcaf3c708

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 7dcd254ad7cc751e64d30bf275a8629781f625be..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";
     }
     revision "2013-10-26" {
         description "Initial revision of macth types";
     }

-
+    

     grouping "mac-address-filter" {
         leaf address {
             mandatory true;
     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";
         container vlan-id {
             description "VLAN id.";
             presence "Match field is active and set";

-            
+
+            leaf vlan-id-present {
+                type boolean;
+            }
+                        

             leaf vlan-id {
             leaf vlan-id {

-                mandatory true;

                 type l2t:vlan-id; 
             }
                 type l2t:vlan-id; 
             }

-            leaf mask {
-                type binary;
-            }

         }
         leaf vlan-pcp {
             description "VLAN priority.";
         }
         leaf vlan-pcp {
             description "VLAN priority.";