nxos: merge nxapi/cli tests - interface, interface_ospf, logging, mtu (#28239)

* refactor nxos_interface

* refactor nxos_interface_ospf

* refactor nxos_logging

* refactor nxos_mtu

test/integration/targets/nxos_interface/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_interface/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_interface/tests/common/set_state_absent.yaml

@@ -1,17 +1,17 @@
 ---
-- debug: msg="START cli/set_state_absent.yaml"
+- debug: msg="START {{ connection.transport }}/set_state_absent.yaml"
 
 - name: setup
   nxos_config:
     lines:
       - interface Loopback1
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
 - name: set state=absent
   nxos_interface:
     interface: Loopback1
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -22,11 +22,11 @@
   nxos_interface:
     interface: Loopback1
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
-- debug: msg="END cli/set_state_absent.yaml"
+- debug: msg="END {{ connection.transport }}/set_state_absent.yaml"

test/integration/targets/nxos_interface/tests/common/set_state_present.yaml

@@ -1,18 +1,18 @@
 ---
-- debug: msg="START cli/set_state_present.yaml"
+- debug: msg="START {{ connection.transport }}/set_state_present.yaml"
 
 - name: setup
   nxos_config:
     lines:
       - no interface Loopback1
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   ignore_errors: yes # Fails if the interface is already absent
 
 - name: set state=present
   nxos_interface:
     interface: Loopback1
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
@@ -23,11 +23,11 @@
   nxos_interface:
     interface: Loopback1
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
-- debug: msg="END cli/set_state_present.yaml"
+- debug: msg="END {{ connection.transport }}/set_state_present.yaml"

test/integration/targets/nxos_interface/tests/nxapi/set_state_absent.yaml

@@ -1,32 +0,0 @@
----
-- debug: msg="START nxapi/set_state_absent.yaml"
-
-- name: setup
-  nxos_config:
-    lines:
-      - interface Loopback1
-    provider: "{{ nxapi }}"
-
-- name: set state=absent
-  nxos_interface:
-    interface: Loopback1
-    state: absent
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == true"
-
-- name: verify state=absent
-  nxos_interface:
-    interface: Loopback1
-    state: absent
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-
-- debug: msg="END nxapi/set_state_absent.yaml"

test/integration/targets/nxos_interface/tests/nxapi/set_state_present.yaml

@@ -1,33 +0,0 @@
----
-- debug: msg="START nxapi/set_state_present.yaml"
-
-- name: setup
-  nxos_config:
-    lines:
-      - no interface Loopback1
-    provider: "{{ nxapi }}"
-  ignore_errors: yes # Fails if the interface is already absent
-
-- name: set state=present
-  nxos_interface:
-    interface: Loopback1
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == true"
-
-- name: verify state=present
-  nxos_interface:
-    interface: Loopback1
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-
-- debug: msg="END nxapi/set_state_present.yaml"