nxos: merge nxapi/cli tests - evpn_global, evpn_vni, facts, feature (#28237)

* refactor nxos_evpn_global

* refactor nxos_evpn_vni

* refactor nxos_facts

* refactor nxos_feature

test/integration/targets/nxos_feature/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_feature/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_feature/tests/common/configure.yaml

@@ -1,17 +1,17 @@
 ---
-- debug: msg="START cli/configure.yaml"
+- debug: msg="START {{ connection.transport }}/configure.yaml"
 
 - name: setup
   nxos_config:
     lines: no feature bgp
     match: none
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
 - name: enable bgp
   nxos_feature:
     feature: bgp
     state: enabled
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -22,7 +22,7 @@
   nxos_feature:
     feature: bgp
     state: enabled
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -33,7 +33,7 @@
   nxos_feature:
     feature: bgp
     state: disabled
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -44,7 +44,7 @@
   nxos_feature:
     feature: bgp
     state: disabled
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -55,6 +55,6 @@
   nxos_config:
     lines: no feature bgp
     match: none
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
-- debug: msg="END cli/configure.yaml"
+- debug: msg="END {{ connection.transport }}/configure.yaml"

test/integration/targets/nxos_feature/tests/common/invalid.yaml

@@ -1,10 +1,10 @@
 ---
-- debug: msg="START cli/invalid.yaml"
+- debug: msg="START {{ connection.transport }}/invalid.yaml"
 
 - name: configure invalid feature name
   nxos_feature:
     feature: invalid
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
   ignore_errors: yes
 
@@ -12,4 +12,4 @@
     that:
       - result.failed == true
 
-- debug: msg="END cli/invalid.yaml"
+- debug: msg="END {{ connection.transport }}/invalid.yaml"

test/integration/targets/nxos_feature/tests/nxapi/configure.yaml

@@ -1,60 +0,0 @@
----
-- debug: msg="START nxapi/configure.yaml"
-
-- name: setup
-  nxos_config:
-    lines: no feature bgp
-    match: none
-    provider: "{{ nxapi }}"
-
-- name: enable bgp
-  nxos_feature:
-    feature: bgp
-    state: enabled
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == true"
-
-- name: verify bgp
-  nxos_feature:
-    feature: bgp
-    state: enabled
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-
-- name: disable bgp
-  nxos_feature:
-    feature: bgp
-    state: disabled
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == true"
-
-- name: verify bgp
-  nxos_feature:
-    feature: bgp
-    state: disabled
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-
-- name: teardown
-  nxos_config:
-    lines: no feature bgp
-    match: none
-    provider: "{{ nxapi }}"
-
-- debug: msg="END nxapi/configure.yaml"

test/integration/targets/nxos_feature/tests/nxapi/invalid.yaml

@@ -1,15 +0,0 @@
----
-- debug: msg="START nxapi/invalid.yaml"
-
-- name: configure invalid feature name
-  nxos_feature:
-    feature: invalid
-    provider: "{{ nxapi }}"
-  register: result
-  ignore_errors: yes
-
-- assert:
-    that:
-      - result.failed == true
-
-- debug: msg="END nxapi/invalid.yaml"