From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 13 Dec 2013 15:05:46 +0000 (+0000)
Subject: Merge "Reverting until appropriate Gerrit for Openflowplugin can be provided."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~198
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=ad66bef7301b5e68680acca8e3818a4ab3624f17;hp=278da513cce5d24869f098286b2ba3292b9c5c36

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