From a54aa10434f8a1d08c01c015006cdf0077c8f54c Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 27 May 2016 12:11:39 +0200 Subject: Vlan alternative model Change-Id: I0dcb535338495b4bb858adf2e2fe1b78cf85c498 Signed-off-by: Maros Marsalek Signed-off-by: Marek Gradzki --- v3po/api/src/main/yang/v3po.yang | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'v3po/api/src/main/yang/v3po.yang') diff --git a/v3po/api/src/main/yang/v3po.yang b/v3po/api/src/main/yang/v3po.yang index c1210a923..86a2764b8 100644 --- a/v3po/api/src/main/yang/v3po.yang +++ b/v3po/api/src/main/yang/v3po.yang @@ -49,6 +49,7 @@ module v3po { } } + // todo remove from v3po typedef tag-rewrite-operation { type enumeration { enum disabled; @@ -149,6 +150,7 @@ module v3po { } } + // todo remove from v3po grouping sub-interface-base-attributes { leaf identifier { type uint32; @@ -322,7 +324,7 @@ module v3po { } } - grouping l2-attributes { + grouping l2-base-attributes { description "Parameters for configuring Layer2 features on interfaces."; @@ -365,9 +367,6 @@ module v3po { } } } - container vlan-tag-rewrite { // todo valid only for sub-interfaces - uses vlan-tag-rewrite-attributes; - } } augment /if:interfaces/if:interface { @@ -418,7 +417,11 @@ module v3po { must "(not (../if:ipv4[if:enabled = 'true']/if:address/if:ip) and " + "not (../if:ipv6[if:enabled = 'true']/if:address/if:ip))"; - uses l2-attributes; + uses l2-base-attributes; + + container vlan-tag-rewrite { + uses vlan-tag-rewrite-attributes; + } } container vxlan-gpe { @@ -511,7 +514,11 @@ module v3po { must "(not (../if:ipv4[if:enabled = 'true']/if:address/if:ip) and " + "not (../if:ipv6[if:enabled = 'true']/if:address/if:ip))"; - uses l2-attributes; + uses l2-base-attributes; + + container vlan-tag-rewrite { + uses vlan-tag-rewrite-attributes; + } } } -- cgit 1.2.3-korg