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

Rename routing group and attributes #587

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Conversation

marian-pritsak
Copy link
Collaborator

Rename "admin state" to "disabled" and combine it into same API with OB routing entry

@marian-pritsak marian-pritsak changed the title Rename routing group attributes Rename routing group and attributes Jun 7, 2024
@marian-pritsak marian-pritsak force-pushed the rg-naming branch 4 times, most recently from 425ab74 to 47fabb6 Compare June 10, 2024 23:57
Copy link
Collaborator

@r12f r12f left a comment

Choose a reason for hiding this comment

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

minor comments in the PR.

@@ -0,0 +1,24 @@
!!python/object:utils.sai_spec.sai_api_group.SaiApiGroup
name: dash_routing_group
Copy link
Collaborator

Choose a reason for hiding this comment

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

this looks to be unexpected, is this something we forgot to clear?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Removed the file since this is part of OB routing.

@@ -10,6 +10,7 @@ api_types:
- SAI_API_DASH_VNET
- SAI_API_DASH_OUTBOUND_ROUTING
- SAI_API_DASH_PA_VALIDATION
- SAI_API_DASH_TUNNEL
Copy link
Collaborator

Choose a reason for hiding this comment

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

the SAI spec merge PR #577 is not merged, which causes the attributes to be inserted in the middle. Do you mind to help review #577, so we can avoid this to happen.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Regenerated after merging latest master.

@@ -2,6 +2,26 @@
name: dash_outbound_routing
description: ''
sai_apis:
- !!python/object:utils.sai_spec.sai_api.SaiApi
Copy link
Collaborator

Choose a reason for hiding this comment

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

the order here is also not right, do you mind to help review #577 to avoid this issue?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Regenerated after merging master.

@r12f
Copy link
Collaborator

r12f commented Jun 20, 2024

hi @marian-pritsak , do we you mind help rebase the PR, then revert the changes on the SAI spec YAML files and regenerate them again? the new merge behavior should get the ordering problem automatically covered.

Signed-off-by: Marian Pritsak <[email protected]>
Copy link
Collaborator

@r12f r12f left a comment

Choose a reason for hiding this comment

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

lgtm!

@r12f r12f merged commit 36ead21 into sonic-net:main Jun 26, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants