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.

Sign up for GitHub

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

Jump to bottom

lag: Remove 'lag' link type, cleanup virtual links #1646

Open
wants to merge 28 commits into
base: dev
Choose a base branch
from
Open

lag: Remove 'lag' link type, cleanup virtual links #1646

wants to merge 28 commits into from

Conversation

jbemmel
Copy link
Collaborator

@jbemmel jbemmel commented Dec 13, 2024 •
edited
Loading

Conceptually a 'lag' link type does not make a whole lot of sense; the lag module temporarily uses a link object as a grouping construct until the node lag interfaces are created, but there is no reason to keep this around once that is done

This PR cleans things up a little:

  • Replace the "lag" link.type with a "virtual_lag" type, and remove those links during post processing
  • Link lag members to the parent device through lag.ifindex, not linkindex (which is now removed from the lag interface)
  • Temporarily uses '_type: lag' interface attribute to pass validation, then renames it to 'type' for backwards compatibility

Includes various bug fixes:

  • Testing and handling of lag attribute inheritance (interface level attributes weren't being considered)
  • Remove MTU from lag interfaces
  • Refactoring of lag module structure (separate 'lag' interface creation)

ipspace
ipspace requested changes Dec 13, 2024
View reviewed changes
Copy link
Owner

@ipspace ipspace left a comment

Choose a reason for hiding this comment

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

The "type" interface attribute should not be defined, otherwise it looks reasonable.

netsim/defaults/attributes.yml Outdated Show resolved Hide resolved
netsim/augment/links.py Show resolved Hide resolved
@ipspace
Copy link
Owner

ipspace commented Dec 13, 2024

Also, what happened to "I will submit a PR when I'm done programming"? Got three notifications about this PR.

@jbemmel jbemmel marked this pull request as draft December 13, 2024 15:20
@jbemmel jbemmel force-pushed the remove-lag-link-type branch from 4702a67 to c812b6c Compare December 14, 2024 17:30
@jbemmel jbemmel mentioned this pull request Dec 14, 2024
Closed
@jbemmel jbemmel force-pushed the remove-lag-link-type branch 4 times, most recently from 2228959 to 43d736c Compare December 15, 2024 17:55
jbemmel added 21 commits December 15, 2024 12:21
@jbemmel
* Remove 'lag' as a link.type, but leave it as an interface.type
7333275 
* Modify lag member lag._parentindex to match lag.ifindex, not linkindex
@jbemmel
'lan' and 'stub' are used for
3ea248d
@jbemmel
Rename to 'virtual_lag'
f89bde9
@jbemmel
Use '_peerlink' for peerlinks to make it more clear that those match …
1759608 
…on intf.linkindex, not intf.lag.ifindex
@jbemmel
vlan_member is also an interface type
09acc3e
@jbemmel
Update error test
9e5e1fd
@jbemmel
* Remove interface.type definition -> requires refactoring of when la…
eb923ab 
…g interfaces get created

* Fix the moment lag interfaces get created: After interface attribute validation, but before vlan pre link transformation callbacks

Some issue remains with IP addresses being allocated to lag interfaces instead of vlan SVI
@jbemmel
Implement p2p pool selection logic
28f2e1e 
TODO: Validate all VLAN cases with/without lag
@jbemmel
vlan: postpone 'link_pre_transform' to 'link_pre_link_transform', aft…
7947c4c 
…er lag interfaces are created
@jbemmel
Correct ip indexes, restore test results
cd1e215
@jbemmel
No return type anymore
3085408
@jbemmel
Change in VLAN processing (delayed) alters the errors that get detected:
942bf30 
* vlan-link-error: Now correctly identifying 'irb' as an invalid value, but hiding the mismatch in vlan.access name
* vlan-trunk-attribute-error: Instead of identifying 'bgp' as being not enabled, 'bgp.as' is determined to be an invalid irb interface attribute
@jbemmel
Split error test cases, as they now hide each other
be27977
@jbemmel
Deep merge when copying gateway attribute
69651d4
@jbemmel
Undo changes to vlan module
67c6167
@jbemmel
Refactored to temporarily rename interface.type to '_type' to bypass …
f2eb984 
…validation
@jbemmel
Undo test changes
8e19e19
@jbemmel
Fix _type check
09c109a
@jbemmel
Rename attribute
94aaf59
@jbemmel
* Add attribute inheritance tests to L2 test case
6dbeb5d 
* Fix interface attribute inheritance
@jbemmel
Remove unused attributes from member interfaces
ead8f75
@jbemmel jbemmel force-pushed the remove-lag-link-type branch from 43d736c to 3fd9f11 Compare December 15, 2024 18:21
@jbemmel jbemmel marked this pull request as ready for review December 15, 2024 18:30
@jbemmel jbemmel mentioned this pull request Dec 15, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ipspace ipspace ipspace requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jbemmel @ipspace