nxos: merge nxapi/cli tests - acl, acl_interface, banner, bgp (#28234)

* refactored nxos_acl

* refactor nxos_acl_interface

* refactor nxos_banner

* refactor nxos_bgp

* fix typo

test/integration/targets/nxos_banner/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_banner/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_banner/tests/cli/basic-no-exec.yaml

@@ -1,41 +0,0 @@
----
-- name: Setup
-  nxos_banner:
-    banner: exec
-    text: |
-      Junk exec banner
-      over multiple lines
-    state: present
-    provider: "{{ cli }}"
-
-- name: remove exec
-  nxos_banner:
-    banner: exec
-    state: absent
-    provider: "{{ cli }}"
-  register: result
-
-- debug:
-    msg: "{{ result }}"
-
-- assert:
-    that:
-      - "result.changed == true"
-      - "'no banner exec' in result.commands"
-
-- name: remove exec (idempotent)
-  nxos_banner:
-    banner: exec
-    state: absent
-    provider: "{{ cli }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-      - "result.commands | length == 0"
-
-
-# FIXME add in tests for everything defined in docs
-# FIXME Test state:absent + test:
-# FIXME Without powers ensure "privileged mode required"

test/integration/targets/nxos_banner/tests/common/basic-exec.yaml

@@ -3,7 +3,7 @@
   nxos_banner:
     banner: exec
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
 - name: Set exec
   nxos_banner:
@@ -13,7 +13,7 @@
       that has a multiline
       string
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - debug:
@@ -32,7 +32,7 @@
       that has a multiline
       string
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:

test/integration/targets/nxos_banner/tests/common/basic-motd.yaml

@@ -3,7 +3,7 @@
   nxos_banner:
     banner: motd
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
 
 - name: Set motd
   nxos_banner:
@@ -13,7 +13,7 @@
       that has a multiline
       string
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - debug:
@@ -32,7 +32,7 @@
       that has a multiline
       string
     state: present
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:

test/integration/targets/nxos_banner/tests/common/basic-no-exec.yaml

@@ -6,13 +6,13 @@
       Junk exec banner
       over multiple lines
     state: present
-    provider: "{{ nxapi }}"
+    provider: "{{ connection }}"
 
 - name: remove exec
   nxos_banner:
     banner: exec
     state: absent
-    provider: "{{ nxapi }}"
+    provider: "{{ connection }}"
   register: result
 
 - debug:
@@ -27,7 +27,7 @@
   nxos_banner:
     banner: exec
     state: absent
-    provider: "{{ nxapi }}"
+    provider: "{{ connection }}"
   register: result
 
 - assert:

test/integration/targets/nxos_banner/tests/nxapi/basic-exec.yaml

@@ -1,45 +0,0 @@
----
-- name: setup - remove exec
-  nxos_banner:
-    banner: exec
-    state: absent
-    provider: "{{ nxapi }}"
-
-- name: Set exec
-  nxos_banner:
-    banner: exec
-    text: |
-      this is my exec banner
-      that has a multiline
-      string
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- debug:
-    msg: "{{ result }}"
-
-- assert:
-    that:
-      - "result.changed == true"
-      - "'banner exec @\nthis is my exec banner\nthat has a multiline\nstring\n@' in result.commands"
-
-- name: Set exec again (idempotent)
-  nxos_banner:
-    banner: exec
-    text: |
-      this is my exec banner
-      that has a multiline
-      string
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-      - "result.commands | length == 0"
-
-# FIXME add in tests for everything defined in docs
-# FIXME Test state:absent + test:
-# FIXME Without powers ensure "privileged mode required"

test/integration/targets/nxos_banner/tests/nxapi/basic-motd.yaml

@@ -1,46 +0,0 @@
----
-- name: setup - remove motd
-  nxos_banner:
-    banner: motd
-    state: absent
-    provider: "{{ nxapi }}"
-
-- name: Set motd
-  nxos_banner:
-    banner: motd
-    text: |
-      this is my motd banner
-      that has a multiline
-      string
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- debug:
-    msg: "{{ result }}"
-
-- assert:
-    that:
-      - "result.changed == true"
-      - "'banner motd @\nthis is my motd banner\nthat has a multiline\nstring\n@' in result.commands"
-
-- name: Set motd again (idempotent)
-  nxos_banner:
-    banner: motd
-    text: |
-      this is my motd banner
-      that has a multiline
-      string
-    state: present
-    provider: "{{ nxapi }}"
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-      - "result.commands | length == 0"
-
-
-# FIXME add in tests for everything defined in docs
-# FIXME Test state:absent + test:
-# FIXME Without powers ensure "privileged mode required"