From dffb11e30ee1bf6bbfdd1ba1a5ce9d0cb636586a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 30 May 2016 14:07:34 +0200 Subject: Remove tags from vlan-tagged match type. Information concerning subinterface tags was already defined in sub-interface-base-attributes. Change-Id: I49bd7cdbd984942b3413bab6b6660da08c5e045c Signed-off-by: Marek Gradzki --- v3po/api/src/main/yang/vpp-vlan.yang | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/v3po/api/src/main/yang/vpp-vlan.yang b/v3po/api/src/main/yang/vpp-vlan.yang index a0ce5f91f..d4e3b64af 100644 --- a/v3po/api/src/main/yang/vpp-vlan.yang +++ b/v3po/api/src/main/yang/vpp-vlan.yang @@ -59,32 +59,7 @@ module vpp-vlan { case vlan-tagged { container vlan-tagged { - description "Matches VLAN tagged frames"; - list tag { - key "index"; - min-elements 1; - max-elements 2; - description "The tags to match, with the outermost tag to - match assigned index 0"; - leaf index { - type uint8 { - range "0..1"; - } - - must "index = 0 or - count(../../tag[index = 0]/index) > 0" { - error-message "An inner tag can only be matched on - when also matching on an outer tag"; - description "Only allow matching on an inner tag, if - also matching on the outer tags at the - same time"; - } - description - "The index into the tag stack, outermost tag first"; - } - - uses dot1q:dot1q-tag-or-any; - } + description "Matches VLAN tagged frames. Vlan tags need to be specified to use this match type"; leaf match-exact-tags { type boolean; @@ -129,7 +104,7 @@ module vpp-vlan { description "The index into the tag stack"; } - uses dot1q:dot1q-tag; + uses dot1q:dot1q-tag-or-any; } } -- cgit 1.2.3-korg