Fix precedence order of vlan.mode to match documentation #578
Conversation
This file contains 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
https://github.com/ipspace/netlab/blob/e3ce92d62e1462b976928ff10e51b60c8edbe8d4/netsim/modules/vlan.py#L118 ``` return get_from_box(intf,'vlan.mode') or \ # 1 + 2 get_from_box(node,f'vlans.{vlan}.mode') or \ # 3 get_from_box(topology,f'vlans.{vlan}.mode') or \ # 5 get_from_box(node,'vlan.mode') or \ # 4 get_from_box(topology,'vlan.mode') or 'irb' # 6 ``` According to the documentation: https://github.com/ipspace/netlab/blob/dev/docs/module/vlan.md#vlan-forwarding-modes ``` The precedence of various vlan.mode parameters (from highest to lowest) is as follows: 1. Interface vlan.mode, potentially inherited from parent interface vlan.mode or from parent interface vlan.trunk dictionary. 2. Link vlan.mode, potentially inherited from parent link vlan.trunk dictionary 3. mode set in node vlans definition 4. Node vlan.mode setting 5. mode set in global vlans definition 6. Global vlan.mode setting ```
|
Test cases would need fixing, first wanted to see if you agree this should be changed |
|
I absolutely agree that the code should match the documentation, and I have no strong preference for current or correct order, although it does make your life easier if you can set node vlan.mode on a router-on-a-stick and have it apply to all VLANs. What do you think makes more sense? |
|
I prefer the documented order, hit this issue in a topology (and switched the order before reading the docs) |
|
Looks like we're in agreement on what to do. Could you please add a commit with fixed tests results and I'll merge it. |
|
Fixed in #581 |
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.
netlab/netsim/modules/vlan.py
Line 118 in e3ce92d
According to the documentation:
https://github.com/ipspace/netlab/blob/dev/docs/module/vlan.md#vlan-forwarding-modes