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_bgp/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_bgp/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_bgp/tests/common/sanity.yaml

@@ -1,5 +1,5 @@
 ---
-- debug: msg="START TRANSPORT:CLI nxos_bgp sanity test"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp sanity test"
 
 - set_fact: neighbor_down_fib_accelerate="true"
   when: (titanium is defined) and not ((titanium | search('true')))
@@ -8,17 +8,17 @@
   when: (titanium is defined) and not ((titanium | search('true')))
 
 - name: "Enable feature BGP"
-  nxos_feature: 
+  nxos_feature:
     feature: bgp
     state: enabled
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   ignore_errors: yes
 
 - name: "Setup"
   nxos_bgp: &remove
     asn: 65535
     state: absent
-    provider: "{{ cli }}"
+    provider: "{{ connection }}"
   ignore_errors: yes
   register: result
 
@@ -28,7 +28,7 @@
       asn: 65535
       router_id: 1.1.1.1
       state: present
-      provider: "{{ cli }}"
+      provider: "{{ connection }}"
     register: result
 
   - assert: &true
@@ -54,7 +54,7 @@
     register: result
 
   - assert: *false
-  
+
   - name: "Configure BGP non defaults"
     nxos_bgp: &configure_non_default
       asn: 65535
@@ -90,9 +90,9 @@
       event_history_periodic: size_small
       suppress_fib_pending: true
       state: present
-      provider: "{{ cli }}"
+      provider: "{{ connection }}"
     register: result
-  
+
   - assert: *true
 
   - name: "Check Idempotence"
@@ -106,18 +106,18 @@
     register: result
 
   - assert: *true
-  
+
   - name: "Check Idempotence"
     nxos_bgp: *remove
     register: result
 
   - assert: *false
-  
+
   - name: "Disable feature bgp"
     nxos_feature:
       feature: bgp
       state: disabled
-      provider: "{{ cli }}"
+      provider: "{{ connection }}"
 
   rescue:
   - name: "Cleanup BGP"
@@ -128,8 +128,8 @@
     nxos_feature:
       feature: bgp
       state: disabled
-      provider: "{{ cli }}"
+      provider: "{{ connection }}"
     ignore_errors: yes
 
   always:
-  - debug: msg="END TRANSPORT:CLI nxos_bgp sanity test"  
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp sanity test"

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

@@ -1,135 +0,0 @@
----
-- debug: msg="START TRANSPORT:NXAPI nxos_bgp sanity test"
-
-- set_fact: neighbor_down_fib_accelerate="true"
-  when: (titanium is defined) and not ((titanium | search('true')))
-
-- set_fact: reconnect_interval="55"
-  when: (titanium is defined) and not ((titanium | search('true')))
-
-- name: "Enable feature BGP"
-  nxos_feature: 
-    feature: bgp
-    state: enabled
-    provider: "{{ nxapi }}"
-  ignore_errors: yes
-
-- name: "Setup"
-  nxos_bgp: &remove
-    asn: 65535
-    state: absent
-    provider: "{{ nxapi }}"
-  ignore_errors: yes
-  register: result
-
-- block:
-  - name: "Configure BGP defaults"
-    nxos_bgp: &configure_default
-      asn: 65535
-      router_id: 1.1.1.1
-      state: present
-      provider: "{{ nxapi }}"
-    register: result
-
-  - assert: &true
-      that:
-        - "result.changed == true"
-
-  - name: "Check Idempotence"
-    nxos_bgp: *configure_default
-    register: result
-
-  - assert: &false
-      that:
-        - "result.changed == false"
-
-  - name: "Remove BGP"
-    nxos_bgp: *remove
-    register: result
-
-  - assert: *true
-
-  - name: "Check Idempotence"
-    nxos_bgp: *remove
-    register: result
-
-  - assert: *false
-  
-  - name: "Configure BGP non defaults"
-    nxos_bgp: &configure_non_default
-      asn: 65535
-      router_id: 1.1.1.1
-      bestpath_always_compare_med: true
-      bestpath_aspath_multipath_relax: true
-      bestpath_compare_routerid: true
-      bestpath_cost_community_ignore: true
-      bestpath_med_confed: true
-      bestpath_med_missing_as_worst: true
-      bestpath_med_non_deterministic: true
-      cluster_id: 10.0.0.1
-      confederation_id: 99
-      disable_policy_batching: true
-      enforce_first_as: false
-      fast_external_fallover: false
-      flush_routes: true
-      graceful_restart_helper: true
-      graceful_restart_timers_restart: 130
-      graceful_restart_timers_stalepath_time: 310
-      isolate: false
-      log_neighbor_changes: true
-      maxas_limit: 50
-      neighbor_down_fib_accelerate: "{{neighbor_down_fib_accelerate|default(omit)}}"
-      reconnect_interval: "{{reconnect_interval|default(omit)}}"
-      shutdown: true
-      timer_bestpath_limit: 255
-      timer_bgp_hold: 110
-      timer_bgp_keepalive: 45
-      event_history_cli: size_medium
-      event_history_detail: size_large
-      event_history_events: size_medium
-      event_history_periodic: size_small
-      suppress_fib_pending: true
-      state: present
-      provider: "{{ nxapi }}"
-    register: result
-  
-  - assert: *true
-
-  - name: "Check Idempotence"
-    nxos_bgp: *configure_non_default
-    register: result
-
-  - assert: *false
-
-  - name: "Remove BGP"
-    nxos_bgp: *remove
-    register: result
-
-  - assert: *true
-  
-  - name: "Check Idempotence"
-    nxos_bgp: *remove
-    register: result
-
-  - assert: *false
-  
-  - name: "Disable feature bgp"
-    nxos_feature:
-      feature: bgp
-      state: disabled
-      provider: "{{ nxapi }}"
-
-  rescue:
-  - name: "Cleanup BGP"
-    nxos_bgp: *remove
-    ignore_errors: yes
-
-  - name: "Disable feature bgp"
-    nxos_feature:
-      feature: bgp
-      state: disabled
-      provider: "{{ nxapi }}"
-    ignore_errors: yes
-
-  always:
-  - debug: msg="END TRANSPORT:NXAPI nxos_bgp sanity test"