nxos: merge nxapi/cli tests - system, user, vlan, vrf (#28241)

* refactor nxos_system

* refactor nxos_user

* refactor nxos_vlan

* refactor nxos_vrf

test/integration/targets/nxos_vrf/tasks/cli.yaml

@@ -1,15 +1,25 @@
 ---
-- name: collect all cli test cases
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
   find:
     paths: "{{ role_path }}/tests/cli"
     patterns: "{{ testcase }}.yaml"
-  register: test_cases
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
 
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: run test case
-  include: "{{ test_case_to_run }}"
+  include: "{{ test_case_to_run }} connection={{ cli }}"
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run

test/integration/targets/nxos_vrf/tasks/nxapi.yaml

@@ -1,9 +1,19 @@
 ---
-- name: collect all nxapi test cases
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
   find:
     paths: "{{ role_path }}/tests/nxapi"
     patterns: "{{ testcase }}.yaml"
-  register: test_cases
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
 
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
@@ -16,7 +26,7 @@
     provider: "{{ cli }}"
 
 - name: run test case
-  include: "{{ test_case_to_run }}"
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run

test/integration/targets/nxos_vrf/tests/cli/sanity.yaml

@@ -1,15 +0,0 @@
----
-- debug: msg="START TRANSPORT:CLI nxos_vrf sanity test"
-
-- name: Ensure ntc VRF exists on switch
-  nxos_vrf:
-    vrf: ntc
-    provider: "{{ cli }}"
-
-- name: Ensure ntc VRF does not exist on switch
-  nxos_vrf:
-    vrf: ntc
-    state: absent
-    provider: "{{ cli }}"
-
-- debug: msg="END TRANSPORT:CLI nxos_vrf sanity test"

test/integration/targets/nxos_vrf/tests/common/sanity.yaml

@@ -0,0 +1,15 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_vrf sanity test"
+
+- name: Ensure ntc VRF exists on switch
+  nxos_vrf:
+    vrf: ntc
+    provider: "{{ connection }}"
+
+- name: Ensure ntc VRF does not exist on switch
+  nxos_vrf:
+    vrf: ntc
+    state: absent
+    provider: "{{ connection }}"
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_vrf sanity test"

test/integration/targets/nxos_vrf/tests/nxapi/sanity.yaml

@@ -1,15 +0,0 @@
----
-- debug: msg="START TRANSPORT:NXAPI nxos_vrf sanity test"
-
-- name: Ensure ntc VRF exists on switch
-  nxos_vrf:
-    vrf: ntc
-    provider: "{{ nxapi }}"
-
-- name: Ensure ntc VRF does not exist on switch
-  nxos_vrf:
-    vrf: ntc
-    state: absent
-    provider: "{{ nxapi }}"
-
-- debug: msg="END TRANSPORT:NXAPI nxos_vrf sanity test"