From 71de7ac80b7ae75f930dba5ac939efc4ce5aaa03 Mon Sep 17 00:00:00 2001 From: mwiebe Date: Wed, 13 Dec 2023 12:17:59 -0500 Subject: [PATCH 1/3] Add DEFAULT_INSTANCE under connection-points endpoints --- .../models/network-instance/openconfig-network-instance.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/models/network-instance/openconfig-network-instance.yang b/release/models/network-instance/openconfig-network-instance.yang index ee5b5a740..b7e585ab4 100644 --- a/release/models/network-instance/openconfig-network-instance.yang +++ b/release/models/network-instance/openconfig-network-instance.yang @@ -699,7 +699,8 @@ module openconfig-network-instance { container endpoints { when "../../../config/type = 'oc-ni-types:L2P2P' " + - "or ../../../config/type = 'oc-ni-types:L2VSI'" { + "or ../../../config/type = 'oc-ni-types:L2VSI'" + + "or ../../../config/type = 'oc-ni-types:DEFAULT_INSTANCE'" { description "Configuration parameters to associate interfaces into a common group for use in Layer 2 network From 25ccf36d38e9cff6ace3cbd82b238f3eb556b7ea Mon Sep 17 00:00:00 2001 From: mwiebe Date: Wed, 13 Dec 2023 12:41:50 -0500 Subject: [PATCH 2/3] Update revision --- .../network-instance/openconfig-network-instance-l2.yang | 8 +++++++- .../network-instance/openconfig-network-instance.yang | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/release/models/network-instance/openconfig-network-instance-l2.yang b/release/models/network-instance/openconfig-network-instance-l2.yang index 16a41451d..e983abef0 100644 --- a/release/models/network-instance/openconfig-network-instance-l2.yang +++ b/release/models/network-instance/openconfig-network-instance-l2.yang @@ -24,7 +24,13 @@ submodule openconfig-network-instance-l2 { Layer 2 network instance configuration and operational state parameters."; - oc-ext:openconfig-version "4.2.2"; + oc-ext:openconfig-version "4.3.0"; + + revision "2023-12-13" { + description + "Expand when statement for connection-points endpoints"; + reference "4.3.0"; + } revision "2023-11-03" { description diff --git a/release/models/network-instance/openconfig-network-instance.yang b/release/models/network-instance/openconfig-network-instance.yang index b7e585ab4..1222b2002 100644 --- a/release/models/network-instance/openconfig-network-instance.yang +++ b/release/models/network-instance/openconfig-network-instance.yang @@ -48,7 +48,13 @@ module openconfig-network-instance { virtual switch instance (VSI). Mixed Layer 2 and Layer 3 instances are also supported."; - oc-ext:openconfig-version "4.2.2"; + oc-ext:openconfig-version "4.3.0"; + + revision "2023-12-13" { + description + "Expand when statement for connection-points endpoints"; + reference "4.3.0"; + } revision "2023-11-03" { description From 3e9b4c8726fd2d908d189a12b13497bd7f5e5286 Mon Sep 17 00:00:00 2001 From: mwiebe Date: Wed, 20 Dec 2023 12:06:56 -0500 Subject: [PATCH 3/3] Remove when statement for vxlan --- .../openconfig-network-instance.yang | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/release/models/network-instance/openconfig-network-instance.yang b/release/models/network-instance/openconfig-network-instance.yang index 1222b2002..b292cfb2b 100644 --- a/release/models/network-instance/openconfig-network-instance.yang +++ b/release/models/network-instance/openconfig-network-instance.yang @@ -808,15 +808,10 @@ module openconfig-network-instance { } } container vxlan { - when "../config/type = 'oc-ni-types:VXLAN'" { - description - "Only include the vxlan configuration when - the endpoint is specified to be vxlan"; - } - description - "Configuration and operational state parameters - relating to a VXLAN tunnel end-point interface"; - uses oc-evpn:evpn-overlays-grp-top; + description + "Configuration and operational state parameters + relating to a VXLAN tunnel end-point interface"; + uses oc-evpn:evpn-overlays-grp-top; } } }