Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DEFAULT_INSTANCE under connection-points endpoints #1017

Merged
merged 3 commits into from
Feb 15, 2024

Conversation

mikewiebe
Copy link
Contributor

@mikewiebe mikewiebe commented Dec 13, 2023

Change Scope

  • Expand when statement under /network-instances/network-instance/connection-points/connection-point/endpoints to include oc-ni-types:DEFAULT_INSTANCE'
  • The change adds to the list of network-instance types that are supported so in that sense the change is backwards compatible
  • Update on 12/20/23 expands the scope slightly for this PR:
    • Fixes a bug in the model by removing the when statement for /network-instances/network-instance/connection-points/connection-point/endpoints/endpoint/vxlan. The when statement references identity ENDPOINT_TYPE but it only includes LOCAL and REMOTE, not VXLAN.

The /network-instances/network-instance/connection-points/connection-point/endpoints/endpoint/vxlan container was added as part of the original EVPN support for the network-instance model. Change Details

This container represents the configuration and operational state parameters relating to a VXLAN tunnel end-point interfaces. The when clause should have been expanded with the original commit since this information should belong to the default network instance.

The layer2 network instance include already has the expanded when clause that includes DEFAULT_INSTANCE.

        uses l2ni-instance {
            when "./config/type = 'oc-ni-types:L2VSI'
                  or ./config/type = 'oc-ni-types:L2P2P'
                  or ./config/type = 'oc-ni-types:L2L3'
                  or ./config/type = 'oc-ni-types:DEFAULT_INSTANCE'" {
                  description
                    "Layer 2 configuration parameters included when
                    a network instance is a Layer 2 instance or a
                    combined L2L3 instance";
            }
        }

@mikewiebe mikewiebe requested a review from a team as a code owner December 13, 2023 17:34
@OpenConfigBot
Copy link

OpenConfigBot commented Dec 13, 2023

No major YANG version changes in commit 3e9b4c8

@dplore
Copy link
Member

dplore commented Dec 13, 2023

This change looks good. I also think it is non-breaking as it is relaxing the when statement to allow an additional condition.
This will be reviewed at the Dec 19, 2023 OC Operators meeting.

@dplore
Copy link
Member

dplore commented Dec 19, 2023

@oscargdd can you please take a look

@mikewiebe mikewiebe force-pushed the connection_points_vxlan branch from b7135a5 to f53df7e Compare December 20, 2023 15:21
@mikewiebe mikewiebe force-pushed the connection_points_vxlan branch from 65bdda0 to 3e9b4c8 Compare February 1, 2024 16:48
@dplore dplore closed this Feb 1, 2024
@dplore dplore reopened this Feb 1, 2024
@dplore
Copy link
Member

dplore commented Feb 1, 2024

@wenovus can you investigate the pyangbind test failure?

@wenovus
Copy link
Contributor

wenovus commented Feb 1, 2024

@wenovus can you investigate the pyangbind test failure?

Hi, I see that pyangbind@7613086 Succeeded, where are you seeing the failure?

@dplore
Copy link
Member

dplore commented Feb 1, 2024

Ah, I guess closing and reopening the PR did in fact cause it to re-run and it passed this time. We can ignore this issue for now.

Copy link
Member

@dplore dplore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. This is a last call for comments. This will be merged on Feb 15, 2024

@dplore dplore merged commit 1b9c817 into openconfig:master Feb 15, 2024
17 checks passed
romeyod pushed a commit to romeyod/aftNextHop that referenced this pull request Sep 19, 2024
* Expand when statement under /network-instances/network-instance/connection-points/connection-point/endpoints to include oc-ni-types:DEFAULT_INSTANCE'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants