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

Fix(eos_designs): Handle overlapping VLAN names for l2vlans and vlan-aware-bundles #2388

Conversation

ClausHolbechArista
Copy link
Contributor

@ClausHolbechArista ClausHolbechArista commented Jan 9, 2023

Change Summary

Handle overlapping VLAN names for l2vlans and vlan-aware-bundles

Related Issue(s)

Fixes #2387

Component(s) name

arista.avd.eos_designs

Proposed changes

  • Add molecule test with overlapping vlan names
  • Fix logic to add all vlans with the same name to the same bundle
  • Fix typo in multicast molecule (duplicate vlan name), since it got triggered by this fix.

How to test

Checklist

User Checklist

  • N/A

Repository Checklist

  • My code has been rebased from devel before I start
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and documentation have been updated accordingly.
  • I have updated molecule CI testing accordingly. (check the box if not applicable)

@adietrich-ussignal
Copy link
Contributor

I ran this with VLANs 2200-2202 having the same name. Looks like the config generated as expected:

   vlan-aware-bundle name_2200
      rd 10.255.12.7:15200
      route-target both 15200:15200
      redistribute learned
      vlan 2200-2202

Copy link
Contributor

@gmuloc gmuloc left a comment

Choose a reason for hiding this comment

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

LGTM - quite a lot of changes in molecule explainable with

  1. Wrong VLAN name for the EVPN_MULTICAST_TESTS
  2. change from int to str for the vlans because now using list_compress to cater for ranges.

@ClausHolbechArista
Copy link
Contributor Author

I ran this with VLANs 2200-2202 having the same name. Looks like the config generated as expected:

   vlan-aware-bundle name_2200
      rd 10.255.12.7:15200
      route-target both 15200:15200
      redistribute learned
      vlan 2200-2202

Thank you for testing this out in your environment. We will get this fix in asap.

@ClausHolbechArista ClausHolbechArista requested a review from a team January 9, 2023 19:50
@adietrich-ussignal
Copy link
Contributor

Given this impacts the name of all existing vlan-aware-bundles (in my environment), would there be a negative effect when these get renamed within the configuration?

Copy link
Member

@carlbuchmann carlbuchmann left a comment

Choose a reason for hiding this comment

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

LGTM

@carlbuchmann carlbuchmann merged commit fd3db93 into aristanetworks:devel Jan 10, 2023
@carlbuchmann
Copy link
Member

Given this impacts the name of all existing vlan-aware-bundles (in my environment), would there be a negative effect when these get renamed within the configuration?

@adietrich-ussignal - I'll reach out to you with @mthiel117 to review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rn: Fix(eos_designs) role: eos_designs issue related to eos_designs role state: CI Updated CI scenario have been updated in the PR state: Documentation role Updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

vlan-aware-bundles only map to single VLAN ID
4 participants