From e192dfabeb6003044e9c99da9694e4a6cd1361a1 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Fri, 13 Dec 2013 14:14:12 +0000 Subject: [PATCH] Reverting until appropriate Gerrit for Openflowplugin can be provided. Revert "VLAN bug fixes" This reverts commit 18e3ef9f1d021b9f5fef70e8a5310b399c4c6459. Change-Id: I7c6df59e301ecd24d4497f516d8f67517804b33d Signed-off-by: Ed Warnicke --- .../model-flow-base/src/main/yang/match-types.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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."; -- 2.36.6