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

Initial MSD Support #249

Draft
wants to merge 70 commits into
base: develop
Choose a base branch
from
Draft

Initial MSD Support #249

wants to merge 70 commits into from
+5,863 −1,540

Conversation

mtarking
Copy link
Collaborator

Related Issue(s)

Aims to resolve #182

Related Collection Role

  • cisco.nac_dc_vxlan.validate
  • cisco.nac_dc_vxlan.dtc.create
  • cisco.nac_dc_vxlan.dtc.deploy
  • cisco.nac_dc_vxlan.dtc.remove
  • other

Related Data Model Element

  • vxlan.global
  • vxlan.topology
  • vxlan.underlay
  • vxlan.overlay_services
  • vxlan.overlay_extensions
  • vxlan.policy
  • defaults.vxlan
  • other

Proposed Changes

Adds support to:

  • create MSD
  • create ISN
  • add child fabrics to MSD
  • remove child fabrics
  • add msd vrfs
  • remove msd vrfs
  • add msd networks
  • remove msd networks

Test Notes

Cisco NDFC Version

12.2.2

Checklist

  • Latest commit is rebased from develop with merge conflicts resolved
  • New or updates to documentation has been made accordingly
  • Assigned the proper reviewers

anramgop and others added 29 commits November 25, 2024 15:10
@anramgop
MSD sub-main changes
a86f756
@anramgop
MSD sub-main changes
77532ee
@anramgop
Added sub-main-common and service model validation
d37cdc4
@anramgop
Split validate and load functions
49dcb6d
@anramgop
Refactoring sub main common
7ef9df8
@anramgop
MSD create role
0bd0e4f
@mikewiebe
Additional refactoring for MSD and VXLAN workflows
075475e
@mtarking
updates for msd fabric templating
9a73ea9
@mtarking
resolve conflicts
9fd9855
@mtarking
remove dup file
0a1b042
@mtarking
update create task for msd
e413ba3
@mtarking
update create task for msd
a220edd
@mikewiebe
Add child fabrics logic
87c8395
@mikewiebe
Merge branch 'msd' of https://github.com/netascode/ansible-dc-vxlan i…
3b2ad70 
…nto msd
@mtarking
updated defaults
a1b5bbd
@mtarking
Merge branch 'msd' of github.com:netascode/ansible-dc-vxlan into msd
c81d63a
@mikewiebe
Update prepare plugins
9070b83
@mtarking
more work on msd & shift to overlay key from overlay_services but wit…
e7520ec 
…h backward compat.
@mtarking
Merge branch 'msd' of github.com:netascode/ansible-dc-vxlan into msd
95730f2
@mtarking
Merge branch 'develop' into msd
58aca5a
@mtarking
updates for build and deployment of both single fabrics and msd fabrics
f821779
@mtarking
chagnes from review with mike
73abf69
@mtarking
update fabric name reference to use extended
becfbd5
@mtarking
updats to msite templates
b6cbb56
@mtarking
update to msd tempaltes and add conditional to only run child fabrics…
1e7af33 
… if defined
@mtarking
first commit from hospital
48019b0
@mtarking
updates for remove child fabrics and isn
15655e7
@mtarking
updates to current msd workflow
13c8ba6
@mtarking
merge develop
88742d2
@mtarking mtarking added the wip work-in-progress label Dec 11, 2024
@mtarking mtarking mentioned this pull request Jan 27, 2025
Open
16 tasks
@ccoueffe
Copy link
Collaborator

ccoueffe commented Jan 29, 2025 •
edited
Loading

There is a typo for msd in resource. Wrong name for dci mask.

ansible-dc-vxlan/roles/dtc/common/templates/ndfc_fabric/msd_fabric/resources/msd_fabric_resources.j2

Lines 4 to 5 in 0ef58cd

DCI_SUBNET_RANGE: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_range | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_range) }}
DCI_SUBNET_TARGET_MASK: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_range | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask) }}

Should be this:

  DCI_SUBNET_RANGE: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_range | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_range) }}
  DCI_SUBNET_TARGET_MASK: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask) }}

@mtarking
Copy link
Collaborator Author 

DCI_SUBNET_TARGET_MASK: {{ vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask | default(defaults.vxlan.multisite.overlay_dci.ipv4_dci_subnet_mask) }}

Thanks @ccoueffe. I have this fixed locally along with additional support for route server just fyi. Should be committing to this branch today.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikewiebe mikewiebe mikewiebe left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
wip work-in-progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add rule to ensure vxlan.global.name is defined MSD Support
5 participants
@mtarking @ccoueffe @mikewiebe @anramgop @mthurstocisco