From: Ed Warnicke <eaw@cisco.com>
Date: Sat, 14 Dec 2013 14:43:52 +0000 (+0000)
Subject: Merge "Revert "Reverting until appropriate Gerrit for Openflowplugin can be provided.""
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~191
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2da26725be793b315794e751ecca009c7691008c;hp=c0497aa3c01474dd6c65a2b4f149feffc12ed90b;p=controller.git

Merge "Revert "Reverting until appropriate Gerrit for Openflowplugin can be provided.""
---

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.";