From 410e898c7e0164eb043bee13662cc6b0976c9efc Mon Sep 17 00:00:00 2001 From: Matt Thurston Date: Thu, 5 Dec 2024 15:11:01 +0000 Subject: [PATCH 1/3] PTP, NXAPI and FABRIC VPC QoS --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 8 ++++++++ .../dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 | 4 +++- roles/validate/files/defaults.yml | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 index ce09372f..a829c52d 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 @@ -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 }} + PTP_LB_ID: {{ 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) }} diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 index 49105ed7..5e99bde2 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 @@ -10,4 +10,6 @@ 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 %} \ No newline at end of file +{% endif %} + FABRIC_VPC_QOS: {{ global.vpc.fabric_vpc_qos | default(defaults.vxlan.global.vpc.fabric_vpc_qos) }} + FABRIC_VPC_QOS_POLICY_NAME: {{ global.vpc.fabric_vpc_qos_policy_name | default(defaults.vxlan.global.vpc.fabric_vpc_qos_policy_name) }} \ No newline at end of file diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml index 2f4ffc69..88d4486a 100644 --- a/roles/validate/files/defaults.yml +++ b/roles/validate/files/defaults.yml @@ -35,6 +35,8 @@ factory_defaults: advertise_pip: false advertise_pip_border_only: true domain_id_range: 1-1000 + fabric_vpc_qos: false + fabric_vpc_qos_policy_name: spine_qos_for_fabric_vpc_peering spanning_tree: root_bridge_protocol: unmanaged vlan_range: @@ -46,6 +48,10 @@ factory_defaults: bridge_priority: 0 netflow: enable: false + ptp: + ptp_enable: false + enable_nxapi: true + enable_nxapi_http: true topology: switches: routing_loopback_id: 0 From 482fa48304c2f6153d0c258987bfcfb30acbdb15 Mon Sep 17 00:00:00 2001 From: Matt Thurston Date: Thu, 5 Dec 2024 17:15:13 +0000 Subject: [PATCH 2/3] updates --- .../dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 | 4 ++-- roles/validate/files/defaults.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 index a829c52d..97cdcf30 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 @@ -5,8 +5,8 @@ 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 }} - PTP_LB_ID: {{ global.ptp.ptp_lb_id }} + 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) }} diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml index 88d4486a..0d2a8591 100644 --- a/roles/validate/files/defaults.yml +++ b/roles/validate/files/defaults.yml @@ -50,6 +50,8 @@ factory_defaults: enable: false ptp: ptp_enable: false + ptp_domain_id: 0 + ptp_lb_id: 0 enable_nxapi: true enable_nxapi_http: true topology: From fb39ec9607faaef411b51f0e6c582ec25f07e10f Mon Sep 17 00:00:00 2001 From: Matt Thurston Date: Fri, 6 Dec 2024 08:20:32 +0000 Subject: [PATCH 3/3] Update dc_vxlan_fabric_vpc.j2 --- .../ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 index 5e99bde2..7fed8400 100644 --- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 +++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/vpc/dc_vxlan_fabric_vpc.j2 @@ -12,4 +12,6 @@ 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) }} - FABRIC_VPC_QOS_POLICY_NAME: {{ global.vpc.fabric_vpc_qos_policy_name | default(defaults.vxlan.global.vpc.fabric_vpc_qos_policy_name) }} \ No newline at end of file +{% 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 %} \ No newline at end of file