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_user/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_user/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 }}"
@@ -14,10 +24,9 @@
       - feature nxapi
       - nxapi http port 80
     provider: "{{ cli }}"
-    timeout: 100
 
 - 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
@@ -27,4 +36,3 @@
     lines:
       - no feature nxapi
     provider: "{{ cli }}"
-    timeout: 100

test/integration/targets/nxos_user/tests/common/basic.yaml

@@ -6,7 +6,7 @@
       - name: ansibletest2
       - name: ansibletest3
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
 # Start tests
 - name: Create user
@@ -14,7 +14,7 @@
     name: ansibletest1
     roles: network-operator
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -30,7 +30,7 @@
       - name: ansibletest3
     state: present
     roles: network-admin
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -44,7 +44,7 @@
       - name: ansibletest2
       - name: ansibletest3
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:

test/integration/targets/nxos_user/tests/nxapi/basic.yaml

@@ -1,53 +0,0 @@
----
-- name: Remove old entries of user
-  nxos_user:
-    aggregate:
-      - name: ansibletest1
-      - name: ansibletest2
-      - name: ansibletest3
-    state: absent
-    provider: "{{ nxapi }}"
-
-# Start tests
-- name: Create user
-  nxos_user:
-    name: ansibletest1
-    roles: network-operator
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - 'result.changed == true'
-      - '"username" in result.commands[0]'
-      - '"role network-operator" in result.commands[1]'
-
-- name: Collection of users
-  nxos_user:
-    aggregate:
-      - name: ansibletest2
-      - name: ansibletest3
-    state: present
-    roles: network-admin
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - 'result.changed == true'
-
-- name: tearDown
-  nxos_user:
-    aggregate:
-      - name: ansibletest1
-      - name: ansibletest2
-      - name: ansibletest3
-    state: absent
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - 'result.changed == true'
-      - '"no username" in result.commands[0]'