Number of extra fabric settings plus a couple of bug fixes #275

mthurstocisco · 2025-02-07T10:53:02Z

Related Issue(s)

Related Collection Role

Related Data Model Element

Proposed Changes

Test Notes

Cisco NDFC Version

Checklist

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

mtarking · 2025-02-07T11:10:02Z

roles/dtc/common/templates/ndfc_fabric/dc_external_fabric/general/dc_external_fabric_general.j2

@@ -1,4 +1,4 @@
 {# Auto-generated NDFC DC VXLAN EVPN General config data structure for fabric {{ vxlan.global.name }} #}
-  BGP_AS: {{ global.bgp_asn }}
+  BGP_AS: "{{ global.bgp_asn }}"


What's your data type in the data model for this now?

Still using a string

mtarking · 2025-02-07T11:10:46Z

roles/validate/files/defaults.yml

+      ptp:
+        ptp_enable: false
+      enable_nxapi: true
+      enable_nxapi_http: true


Can we default NXAPI HTTP to false and disabled? Even on the switch nowadays, http is disabled by default whereas https is enabled by default.

Happy to change to whatever, we were just mirroring the defaults in NDFC, should we diverge and make different decisions to the tool?

Updated to false

mtarking · 2025-02-07T11:11:41Z

roles/dtc/create/tasks/sub_main.yml

+- name: Config-Save block
+  block:
+    - name: Config-Save for Fabric {{ MD.vxlan.global.name }}
+      cisco.dcnm.dcnm_rest:
+        method: POST
+        path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ MD.vxlan.global.name }}/config-save"
+      when: MD_Extended.vxlan.topology.switches | length > 0
+      register: config_save
+      # TODO: Need to add logic to only save if changes are made
+
+  rescue:
+    - name: Config-Save for Fabric {{ MD.vxlan.global.name }} - Failed
+      ansible.builtin.debug:
+        msg: "{{ config_save.msg.DATA }}"
+


I think I know what this is and @mikewiebe was talking to me about this some, but want to understand this better in our standups.

sure, basic reason for save at this state is so that NDFC can do its easy fabric stuff (around both links and VPC config), happy to run through it though next time we chat

mtarking · 2025-02-07T11:12:28Z

roles/dtc/create/tasks/interfaces.yml

+# --------------------------------------------------------------------
+# Manage Interface Trunk Configuration on NDFC
+# --------------------------------------------------------------------
+
+- name: Manage Interface Trunk
+  cisco.dcnm.dcnm_interface:
+    fabric: "{{ MD.vxlan.global.name }}"
+    state: replaced
+    config: "{{ interface_trunk }}"
+  when: MD_Extended.vxlan.topology.interfaces.modes.trunk.count > 0
+
+# --------------------------------------------------------------------
+# Manage Interface Access Routed Configuration on NDFC
+# --------------------------------------------------------------------
+
+- name: Manage Interface Access
+  cisco.dcnm.dcnm_interface:
+    fabric: "{{ MD.vxlan.global.name }}"
+    state: replaced
+    config: "{{ interface_access }}"
+  when: MD_Extended.vxlan.topology.interfaces.modes.access.count > 0
+


Why is this net new for trunks and access interfaces?

shouldn't be new, just moved around the ordering (basically if the member ports from a PO don't exist then you cant add them to the PO, again, all this for pre provisioning)

mtarking · 2025-02-07T11:13:21Z

roles/dtc/common/templates/ndfc_vpc_peering.j2

+{% if MD_Extended.vxlan.topology.leaf is defined and vpc_peer.peer1 in MD_Extended.vxlan.topology.leaf %}
 {% if MD_Extended.vxlan.topology.leaf[vpc_peer.peer1].management_ipv4_address is not none %}
 - peerOneId: {{ MD_Extended.vxlan.topology.leaf[vpc_peer.peer1].management_ipv4_address }}
 {% elif MD_Extended.vxlan.topology.leaf[vpc_peer.peer1].management_ipv6_address is not none %}
 - peerOneId: {{ MD_Extended.vxlan.topology.leaf[vpc_peer.peer1].management_ipv6_address }}
+{% else %}
+- peerOneId: {{ vpc_peer.peer1 }}
 {% endif %}
+{% else %}
+- peerOneId: {{ vpc_peer.peer1 }}
+{% endif %}
+{% if MD_Extended.vxlan.topology.leaf is defined and vpc_peer.peer2 in MD_Extended.vxlan.topology.leaf %}
 {% if MD_Extended.vxlan.topology.leaf[vpc_peer.peer2].management_ipv4_address is not none %}
  peerTwoId: {{ MD_Extended.vxlan.topology.leaf[vpc_peer.peer2].management_ipv4_address }}
 {% elif MD_Extended.vxlan.topology.leaf[vpc_peer.peer2].management_ipv6_address is not none %}
  peerTwoId: {{ MD_Extended.vxlan.topology.leaf[vpc_peer.peer2].management_ipv6_address }}
+{% else %}
+  peerTwoId: {{ vpc_peer.peer2 }}
+{% endif %}
+{% else %}
+  peerTwoId: {{ vpc_peer.peer2 }}


So, for this template, there's an action plugin that is setting up the index by role that we actually need to refactor and not do it that way as it limits things to only leaf roles now for some reason.

lets discuss more in person, think @peter8498 can speak more to this one

roles/dtc/common/templates/ndfc_policy.j2

mtarking · 2025-02-07T11:16:14Z

roles/dtc/common/templates/ndfc_interface_vpc.j2

+    peer1_cmds: |2-
+      {{ switches[peer1].freeform_config | default('') | indent(6, false) }}
+    peer2_cmds: |2-
+      {{ switches[peer2].freeform_config | default('') | indent(6, false)  }}


Just want to make sure I understand this in next standup.

just adding support for freeform under each peer

mtarking · 2025-02-07T11:17:28Z

roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/protocols/dc_vxlan_fabric_protocols.j2

+{% if (vxlan.underlay.general.replication_mode | default(defaults.vxlan.underlay.general.replication_mode) ) == 'multicast' %}
  BFD_PIM_ENABLE: {{ vxlan.underlay.bfd.pim | default(defaults.vxlan.underlay.bfd.pim) }}
+{% endif %}


There's a bunch of refactor in PR #268 for IPv6 and mcast; lets just make sure we don't create a conflict here.

looks like we are setting BRD_PIM_ENABLE in very different circumstances from reading your PR, lets discuss on a call

mtarking · 2025-02-07T11:18:02Z

roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2

+{% if global.bootstrap is defined and global.bootstrap.cdp_enable is defined %}
+  CDP_ENABLE: global.bootstrap.cdp_enable
+{% endif %}


Does this only apply to bootstrap?

Yeah this is only to set CDP to on on the management interface at bootstrap, just tested on an already bootstrapped fabric, doesn't attempt to change any existing switch config, just a badly named key on the NDFC side

mtarking · 2025-02-07T11:19:11Z

roles/validate/files/defaults.yml

+        fabric_vpc_qos: false
+        fabric_vpc_qos_policy_name: spine_qos_for_fabric_vpc_peering
+        enable_ipv6_nd_sync: true


Just general comment, don't forget updating defaults in schema repo.

Initial commit

38f4a4f

mthurstocisco requested review from mikewiebe and mtarking February 7, 2025 10:53

mthurstocisco requested a review from a team as a code owner February 7, 2025 10:53

mthurstocisco added bug Something isn't working enhancement New feature or request labels Feb 7, 2025

mtarking requested changes Feb 7, 2025

View reviewed changes

mtarking reviewed Feb 7, 2025

View reviewed changes

peter8498 and others added 3 commits February 12, 2025 10:51

Update dc_vxlan_fabric_advanced.j2 to add braces

9bdb616

revert policy change

95bbaf3

Update defaults.yml

135d8fd

peter8498 requested a review from mtarking February 24, 2025 17:06

Update links_filter_and_remove.py

8f783a8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Number of extra fabric settings plus a couple of bug fixes #275

Number of extra fabric settings plus a couple of bug fixes #275

mthurstocisco commented Feb 7, 2025 •

edited

Loading

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

peter8498 Feb 24, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

mthurstocisco Feb 13, 2025

mtarking Feb 7, 2025

Number of extra fabric settings plus a couple of bug fixes #275

Are you sure you want to change the base?

Number of extra fabric settings plus a couple of bug fixes #275

Conversation

mthurstocisco commented Feb 7, 2025 • edited Loading

Related Issue(s)

Related Collection Role

Related Data Model Element

Proposed Changes

Test Notes

Cisco NDFC Version

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mthurstocisco commented Feb 7, 2025 •

edited

Loading