Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan #3075

bjmeuer · 2023-08-03T06:02:54Z

Change Summary

Add a structure to define vlan-aware bundles and an option to reference this definition from l2vlans.

Related Issue(s)

Component(s) name

arista.avd.eos_designs

Proposed changes

Code checks if a l2vlan references a vlan-aware bundle with the option evpn_vlan_bundle and if so it will inherit the settings from the referenced vlan-aware bundle definition. If none is defined it falls back to the vlan name as vlan-aware-bundle name.

How to test

---
  - name: FABRIC
    vlan_aware_bundle_number_base: 200
    mac_vrf_vni_base: 10000
    l2vlans:
      - id: 50
        name: ipmi
        tags: ['ipmi']
        evpn_vlan_bundle: bundle1
      - id: 60
        name: ipmi
        tags: ['fabric']
        evpn_vlan_bundle: bundle1
      - id: 70
        name: vmotion
        tags: ['ipmi']
        evpn_vlan_bundle: bundle2
      - id: 80
        name: vstorage
        tags: ['fabric']
        evpn_vlan_bundle: bundle2

evpn_vlan_bundles:
  - name: bundle1
    id: 1
    bgp:
      raw_eos_cli: |
        vlan add 1000
  - name: bundle2
    id: 2
    rt_override: 111
    rd_override: 1.1.1.1:222

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)

...ta/avd/molecule/eos_designs_unit_tests/inventory/host_vars/evpn_l2vlan_bundle_definition.yml

ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py

...tions/arista/avd/roles/eos_designs/schemas/schema_fragments/defs_network_services.schema.yml

…ative test

...collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py

bjmeuer

looks good to me, tested with data from my customer as well and it looks good.

github-actions · 2023-09-13T02:07:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2023-09-13T04:36:57Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py

ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml

..._designs_negative_unit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml

...ule/eos_designs_negative_unit_tests/inventory/host_vars/failure-missing-evpn-vlan-bundle.yml

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py

…nit_tests/inventory/host_vars/failure-missing-evpn-vlan-bundle.yml Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>

…s/network_services/router_bgp.py Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>

…muloc)

ClausHolbechArista

Only found some wording in the error message that could be improved.
Approving since everything else looks great.

..._designs_negative_unit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml

…nit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml Co-authored-by: Claus Holbech <holbech@arista.com>

gmuloc

Once the CI finishes (after the commit I just pushed) - LGTM
Thanks @bjmeuer for the work!

Feat (eos-designs) EVPN vlan-aware-bundle option for l2vlan

0e74606

github-actions bot added state: CI Updated CI scenario have been updated in the PR role: eos_designs issue related to eos_designs role labels Aug 3, 2023

github-actions bot assigned bjmeuer Aug 3, 2023

bjmeuer changed the title ~~Feat (eos-designs): EVPN vlan-aware-bundle option for l2vlan~~ Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan Aug 3, 2023

remove spaces

f9e0ba1

ClausHolbechArista reviewed Aug 3, 2023

View reviewed changes

Bjoern Meuer added 2 commits August 3, 2023 08:33

remove more spaces and change list() to []

8d82851

Feat(eos_designs): Vlan-aware-bundle option update code

a82fe53

github-actions bot added the state: Documentation role Updated label Aug 3, 2023

Bjoern Meuer and others added 5 commits August 3, 2023 13:37

update modified molecule test structured configs

2b0e974

Merge branch 'aristanetworks:devel' into VlanBundleDefinition

309abb0

Feat(eos_desigs): VlanAwareBundle option - updated to sorted list

a5a1c4c

remove prints

647d635

fix sorting part 2

e4c6d98

bjmeuer marked this pull request as ready for review August 3, 2023 16:26

bjmeuer requested review from a team as code owners August 3, 2023 16:26

carlbuchmann reviewed Aug 4, 2023

View reviewed changes

...tions/arista/avd/roles/eos_designs/schemas/schema_fragments/defs_network_services.schema.yml Outdated Show resolved Hide resolved

bjmeuer added 3 commits August 10, 2023 15:33

Check global setting in case evpn_vlan_bundle is defined + adding neg…

66403a1

…ative test

add missing hostvars file for failure_evpn_vlan_bundle

a7c406b

add empty line

3ad01e4

carlbuchmann self-requested a review August 11, 2023 00:09

carlbuchmann reviewed Aug 11, 2023

View reviewed changes

...collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_vlan_bundle.cfg Show resolved Hide resolved

ClausHolbechArista reviewed Aug 11, 2023

View reviewed changes

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py Outdated Show resolved Hide resolved

carlbuchmann marked this pull request as draft August 11, 2023 14:17

bjmeuer and others added 2 commits August 14, 2023 08:35

Merge branch 'aristanetworks:devel' into VlanBundleDefinition

ef6204d

Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan - redesigned

0704070

github-actions bot added the role: eos_cli_config_gen issue related to eos_cli_config_gen role label Aug 18, 2023

fixed space and schema issues

ccae103

ClausHolbechArista and others added 2 commits September 8, 2023 11:14

update schema

07cf7ea

Merge branch 'aristanetworks:devel' into VlanBundleDefinition

03dc6d2

bjmeuer commented Sep 8, 2023

View reviewed changes

Merge branch 'devel' into VlanBundleDefinition

681146a

github-actions bot added the state: conflict PR with conflict label Sep 13, 2023

Merge branch 'devel' into VlanBundleDefinition

73a4df7

github-actions bot removed the state: conflict PR with conflict label Sep 13, 2023

gmuloc reviewed Sep 14, 2023

View reviewed changes

ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py Outdated Show resolved Hide resolved

ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml Outdated Show resolved Hide resolved

bjmeuer and others added 6 commits September 18, 2023 07:09

Merge branch 'aristanetworks:devel' into VlanBundleDefinition

6c43449

update based on Guillaume and Claus comments

19ddcbf

make evpn_vlan_bundle unique from vlan names

5e8f399

Optimize duplication checks for evpn bundles

78f322c

Merge branch 'devel' into VlanBundleDefinition

ab9285c

Merge branch 'devel' into VlanBundleDefinition

66c0284

bjmeuer requested a review from gmuloc September 26, 2023 05:42

gmuloc requested changes Sep 26, 2023

View reviewed changes

bjmeuer and others added 3 commits September 27, 2023 09:07

Merge branch 'aristanetworks:devel' into VlanBundleDefinition

70f5cda

Update ansible_collections/arista/avd/molecule/eos_designs_negative_u…

8e082fb

…nit_tests/inventory/host_vars/failure-missing-evpn-vlan-bundle.yml Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>

Update ansible_collections/arista/avd/roles/eos_designs/python_module…

411beed

…s/network_services/router_bgp.py Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>

ClausHolbechArista added this to the v4.4.0 milestone Sep 27, 2023

Adding more context in case of duplicate detection (as suggested by g…

ab9b8db

…muloc)

bjmeuer requested a review from gmuloc September 27, 2023 10:36

ClausHolbechArista approved these changes Sep 27, 2023

View reviewed changes

..._designs_negative_unit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml Outdated Show resolved Hide resolved

bjmeuer and others added 2 commits September 27, 2023 13:29

Update ansible_collections/arista/avd/molecule/eos_designs_negative_u…

3fddf6a

…nit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml Co-authored-by: Claus Holbech <holbech@arista.com>

Fix: Change error message to match the better expected one

b650a4a

gmuloc approved these changes Sep 27, 2023

View reviewed changes

JulioPDX merged commit febe778 into aristanetworks:devel Sep 27, 2023
37 checks passed

github-actions bot added the rn: Feat(eos_designs) label Sep 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan #3075

Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan #3075

bjmeuer commented Aug 3, 2023 •

edited

bjmeuer left a comment

github-actions bot commented Sep 13, 2023

github-actions bot commented Sep 13, 2023

ClausHolbechArista left a comment

gmuloc left a comment

Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan #3075

Feat(eos_designs): EVPN vlan-aware-bundle option for l2vlan #3075

Conversation

bjmeuer commented Aug 3, 2023 • edited

Change Summary

Related Issue(s)

Component(s) name

Proposed changes

How to test

Checklist

User Checklist

Repository Checklist

bjmeuer left a comment

Choose a reason for hiding this comment

github-actions bot commented Sep 13, 2023

github-actions bot commented Sep 13, 2023

ClausHolbechArista left a comment

Choose a reason for hiding this comment

gmuloc left a comment

Choose a reason for hiding this comment

bjmeuer commented Aug 3, 2023 •

edited