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

Additional features/settings added to fabric creation #245

Closed
wants to merge 3 commits into from
Closed

Additional features/settings added to fabric creation #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
410e898
PTP, NXAPI and FABRIC VPC QoS
mthurstocisco Dec 5, 2024
482fa48
updates
mthurstocisco Dec 5, 2024
fb39ec9
Update dc_vxlan_fabric_vpc.j2
mthurstocisco Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
GRFIELD_DEBUG_FLAG: Enable
ENABLE_PVLAN: false
AAA_REMOTE_IP_ENABLED: False
FEATURE_PTP: {{ global.ptp.ptp_enable | default(defaults.vxlan.global.ptp.ptp_enable) }}
{% if global.ptp.ptp_enable is defined and global.ptp.ptp_enable == 'true' %}
PTP_DOMAIN_ID: {{ global.ptp.ptp_domain_id | default(defaults.vxlan.global.ptp_domain_id) }}
PTP_LB_ID: {{ global.ptp.ptp_lb_id | default(defaults.vxlan.global.ptp.ptp_lb_id) }}
PTP_VLAN_ID: {{ global.ptp.ptp_vlan_id }}
{% endif %}
ENABLE_NXAPI: {{ global.enable_nxapi | default(defaults.vxlan.global.enable_nxapi) }}
ENABLE_NXAPI_HTTP: {{ global.enable_nxapi_http | default(defaults.vxlan.global.enable_nxapi_http ) }}
FABRIC_MTU: {{ vxlan.underlay.general.intra_fabric_interface_mtu | default(defaults.vxlan.underlay.general.intra_fabric_interface_mtu) }}
L2_HOST_INTF_MTU: {{ vxlan.underlay.general.layer2_host_interfacde_mtu | default(defaults.vxlan.underlay.general.layer2_host_interfacde_mtu) }}
HOST_INTF_ADMIN_STATE: {{ vxlan.underlay.general.unshut_host_interfaces | default(defaults.vxlan.underlay.general.unshut_host_interfaces) }}
Expand Down
4 changes: 4 additions & 0 deletions roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@
ADVERTISE_PIP_BGP: {{ (global.vpc.advertise_pip | default(defaults.vxlan.global.vpc.advertise_pip) | title) }}
{% if (global.vpc.advertise_pip | default(defaults.vxlan.global.vpc.advertise_pip) | title) == 'False' %}
ADVERTISE_PIP_ON_BORDER: {{ global.vpc.advertise_pip_border_only | default(defaults.vxlan.global.vpc.advertise_pip_border_only) | title }}
{% endif %}
FABRIC_VPC_QOS: {{ global.vpc.fabric_vpc_qos | default(defaults.vxlan.global.vpc.fabric_vpc_qos) }}
{% if (global.vpc.fabric_vpc_qos is defined and global.vpc.fabric_vpc_qos == 'true' ) %}
FABRIC_VPC_QOS_POLICY_NAME: {{ global.vpc.fabric_vpc_qos_policy_name | default(defaults.vxlan.global.vpc.fabric_vpc_qos_policy_name) }}
{% endif %}
8 changes: 8 additions & 0 deletions roles/validate/files/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ factory_defaults:
advertise_pip: false
advertise_pip_border_only: true
domain_id_range: 1-1000
fabric_vpc_qos: false
Copy link
Collaborator

@mikewiebe mikewiebe Dec 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Please open a PR to add these to the internal repo defaults since that is the source of truth for defaults. Reminds me that I need to make sure we refreshing the set of defaults from that repo for each release.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I discovered that we indeed where a bit out of sync. Opened a PR to address this

https://wwwin-github.cisco.com/netascode/nac-vxlan/pull/123

fabric_vpc_qos_policy_name: spine_qos_for_fabric_vpc_peering
spanning_tree:
root_bridge_protocol: unmanaged
vlan_range:
Expand All @@ -46,6 +48,12 @@ factory_defaults:
bridge_priority: 0
netflow:
enable: false
ptp:
ptp_enable: false
ptp_domain_id: 0
ptp_lb_id: 0
enable_nxapi: true
enable_nxapi_http: true
Comment on lines +55 to +56
Copy link
Collaborator

Choose a reason for hiding this comment

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

@mikewiebe can you (we) review these with respect to d2d that @rafmuller was looking at for device specific; i.e. if a device also has these like we talked maybe we enable fabric wide for dtc vs defining in model as such...thoughts???

topology:
switches:
routing_loopback_id: 0
Expand Down
Loading