Merge branch 'main' into cdp_changes

Author: nickbhasin

.pre-commit-config.yaml

@@ -40,14 +40,14 @@ repos:
           - prettier-plugin-toml
 
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.1
+    rev: 6.1.0
     hooks:
       - id: isort
         name: Sort import statements using isort
         args: ["--filter-files"]
 
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
       - id: black
 

tests/integration/labs/inventory.j2

@@ -6,6 +6,7 @@ ansible_host={{ ansible_host }}
 ansible_network_os={{ ansible_network_os | default('cisco.nxos.nxos') }}
 ansible_user={{ ansible_user | default('ansible') }}
 ansible_ssh_pass={{ ansible_ssh_pass | default('ansible') }}
+ansible_connection=ansible.netcommon.network_cli
 ansible_network_cli_ssh_type={{ ansible_network_cli_ssh_type | default('libssh') }}
 ansible_ssh_port={{ ansible_ssh_port }}
 ansible_httpapi_port={{ ansible_http_port }}

tests/integration/targets/nxos_bgp_global/tests/common/deleted_af.yaml

@@ -1,6 +1,6 @@
 ---
 - ansible.builtin.debug:
-    msg: Start nxos_bgp_global deleted_af integration tests connection={{ ansible_connection}}
+    msg: Start nxos_bgp_global deleted_af integration tests connection={{ ansible_connection }}
 
 - name: Remove pre-existing BGP configurations
   cisco.nxos.nxos_config: &remove
@@ -19,9 +19,7 @@
       - "  address-family ipv4 unicast"
       - "    next-hop-self"
       - "  remote-as 65538"
-      - "  affinity-group 160"
       - "  description NBR-1"
-      - "  low-memory exempt"
       - "neighbor 192.0.2.1"
       - "  remote-as 65537"
   vars:
@@ -58,10 +56,7 @@
           - "    address-family ipv4 unicast"
           - "      next-hop-self"
           - "    remote-as 65538"
-          - "    affinity-group 160"
           - "    description NBR-1"
-          - "    low-memory exempt"
-          - "  neighbor-down fib-accelerate"
 
     - name: Remove a neighbor under a VRF having AF configurations (should fail)
       cisco.nxos.nxos_bgp_global: *deleted
@@ -93,11 +88,8 @@
           - "    default-information originate"
           - "  neighbor 203.0.113.2"
           - "    remote-as 65538"
-          - "    affinity-group 160"
           - "    description NBR-1"
-          - "    low-memory exempt"
           - "vrf site-2"
-          - "  neighbor-down fib-accelerate"
 
     - name: Remove a neighbor under a VRF having AF configurations (should fail)
       cisco.nxos.nxos_bgp_global: *deleted