Issue #22420: Modify 'config route add' command not to include empty … #3862
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
anders-nexthop
force-pushed
the
anders.nexthop-vrf-bug
branch
from
bc05ba7 to
e06623d
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
anders-nexthop
force-pushed
the
anders.nexthop-vrf-bug
branch
from
e06623d to
87311d7
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…elements (sonic-net#12) 'config route add' fills out missing 'nexthop-vrf' elements with the empty string (''). This is not valid in the yang model; vrf names can only be 'default', 'mgmt', or 'VRF<somestring>'.
anders-nexthop
force-pushed
the
anders.nexthop-vrf-bug
branch
from
87311d7 to
15f0abc
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
The config route commands accept a
nexthop-vrfas an argument. When that argument is not specified, the commands use the empty string as the default. This violates the yang model, which only accepts vrf names of the form (default,mgmt, orVrf*). In the case where anexthop-vrfis not defined, we should fall back to using the same vrf given for the prefix we are adding. If that is not specified, then both prefix and nexthop will use the default vrf.Fixes: #22420
How I did it
Modify the
add_route()anddel_route()codepaths from sonic-utilites/config/main.py to set nexthop-vrf to whatever the vrf is for the associated prefix whenever it is not explicitly specified.How to verify it
All unit tests pass (including all tests in
static_route_test.py).I don't think the output of any show commands changes because of this, but it's possible there are combinations of different VRFs which would show up differently. Before this merges I'll set up some routes and nexthops with different VRFs and make sure any changes there may be are shown here.
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)