Merge branch 'main' into fix_hardware_subsets_for_nxos_9.3_version

changelogs/fragments/tests_fix.yaml

@@ -0,0 +1,5 @@
+---
+bugfixes:
+  - Fixes mixed usage of f-string and format string in action plugin for consistency.
+trivial:
+  - Added tests fixes for nxos_facts.

plugins/action/nxos.py

@@ -60,8 +60,7 @@ def run(self, tmp=None, task_vars=None):
                     "msg": (
                         f"Connection type must be fully qualified name for "
                         f"network_cli connection type, got {self._play_context.connection}"
-                    )
-                    % self._play_context.connection,
+                    ),
                 }
 
             conn = Connection(self._connection.socket_path)

tests/integration/targets/nxos_facts/vars/main.yml

@@ -28,6 +28,6 @@ available_network_resources:
   - static_routes
   - telemetry
   - vlans
+  - vrf_address_family
   - vrf_global
   - vrf_interfaces
-  - vrf_address_family

tests/integration/targets/nxos_file_copy/tests/cli/input_validation.yaml

@@ -21,7 +21,7 @@
 
 - ansible.builtin.assert:
     that:
-      - result is search("argument 'file_pull_timeout' is of type .* and we were unable to convert to int")
+      - result.msg is ansible.builtin.search("argument 'file_pull_timeout' is of type .* and we were unable to convert to int", multiline=true)
 
 - name: Input validation - param should be type <bool>
   register: result