From: Prasanna Huddar <prasanna.huddar@ericsson.com>
Date: Thu, 12 Dec 2013 14:56:17 +0000 (+0530)
Subject: VLAN bug fixes
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~199^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=18e3ef9f1d021b9f5fef70e8a5310b399c4c6459

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 7dcd254ad7..1ed1b6827b 100644
--- 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.";