remove unnecesarry changes

Author: nickbhasin

tests/integration/labs/inventory.j2

@@ -12,3 +12,5 @@ ansible_ssh_port={{ ansible_ssh_port }}
 ansible_httpapi_port={{ ansible_http_port }}
 ansible_become={{ ansible_become | default(true) }}
 ansible_become_password={{ ansible_become_password | default('cisco') }}
+ansible_command_timeout={{ ansible_command_timeout | default(90) }}
+ansible_httpapi_con_timeout={{ ansible_httpapi_con_timeout | default(90) }}

tests/integration/targets/nxos_aaa_server/tasks/nxapi.yaml

@@ -29,4 +29,3 @@
     loop_var: test_case_to_run
   vars:
     ansible_connection: ansible.netcommon.httpapi
-    ansible_command_timeout: 90

tests/integration/targets/nxos_acl_interfaces/tests/common/populate_config.yaml

@@ -2,5 +2,3 @@
 - name: Adding base configuration
   cisco.nxos.nxos_config:
     src: populate_config.cfg
-  retries: 5
-  delay: 25

tests/integration/targets/nxos_acl_interfaces/tests/common/remove_config.yaml

@@ -10,12 +10,6 @@
       - "interface Ethernet1/2"
       - "  no ipv6 traffic-filter ACL1v6 in"
   ignore_errors: true
-  register: remove_config_1
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_1.failed
 
 - name: Remove configuration - 2
   cisco.nxos.nxos_config:
@@ -24,12 +18,6 @@
       - no ipv6 traffic-filter ACL1v6 in
     parents: interface Ethernet1/5
   ignore_errors: true
-  register: remove_config_2
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_2.failed
 
 - name: Remove configuration - 3
   cisco.nxos.nxos_config:
@@ -38,25 +26,13 @@
       - no ip access-group ACL1v4 out
     parents: interface Ethernet1/3
   ignore_errors: true
-  register: remove_config_3
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_3.failed
 
 - name: Remove configuration - 4
   cisco.nxos.nxos_config:
     lines:
       - no ip access-group NewACLv4 out
     parents: interface Ethernet1/4
   ignore_errors: true
-  register: remove_config_4
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_4.failed
 
 - name: Remove configuration - 5
   cisco.nxos.nxos_config:
@@ -66,20 +42,8 @@
       - no ip port access-group PortACL in
     parents: interface Ethernet1/6
   ignore_errors: true
-  register: remove_config_5
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_5.failed
 
 - name: Remove configuration - 6
   cisco.nxos.nxos_config:
     lines: no interface loopback1
   ignore_errors: true
-  register: remove_config_6
-
-- name: Wait for 25 seconds if removal was successful
-  ansible.builtin.wait_for:
-    timeout: 25
-  when: not remove_config_6.failed

tests/integration/targets/nxos_bfd_interfaces/tests/common/deleted.yaml

@@ -33,8 +33,6 @@
             bfd: "{{ bfd_disable|default(omit)}}"
             echo: disable
         state: merged
-      vars:
-        ansible_command_timeout: 90
 
     - name: Gather bfd_interfaces facts
       cisco.nxos.nxos_facts:

tests/integration/targets/nxos_bfd_interfaces/tests/common/overridden.yaml

@@ -22,8 +22,6 @@
       - "no feature bfd"
       - "default interface {{ test_int1 }}"
       - "default interface {{ test_int2 }}"
-  vars:
-    ansible_command_timeout: 90
 
 - block:
     - name: Setup2

tests/integration/targets/nxos_bgp_global/tasks/main.yaml

@@ -8,8 +8,6 @@
 - name: Enable fabric forwarding
   cisco.nxos.nxos_config:
     lines: feature fabric forwarding
-  vars:
-    ansible_connection: ansible.netcommon.network_cli
 
 - name: Run the CLI and NX-API tests
   block:
@@ -28,11 +26,7 @@
       cisco.nxos.nxos_feature:
         feature: bgp
         state: disabled
-      vars:
-        ansible_connection: ansible.netcommon.network_cli
 
     - name: Disable fabric forwarding
       cisco.nxos.nxos_config:
         lines: no feature fabric forwarding
-      vars:
-        ansible_connection: ansible.netcommon.network_cli

tests/integration/targets/nxos_bgp_global/tests/common/replaced_af.yaml

@@ -24,8 +24,6 @@
       - "  low-memory exempt"
       - "neighbor 192.0.2.1"
       - "  remote-as 65537"
-  vars:
-    ansible_connection: ansible.netcommon.network_cli
 
 - block:
     - name: Remove a neighbor having AF configurations (should fail)

tests/integration/targets/nxos_config/tasks/main.yaml

@@ -25,5 +25,3 @@
         lines:
           - hostname {{ inventory_hostname_short }}
         match: none
-      vars:
-        ansible_connection: ansible.netcommon.network_cli

tests/integration/targets/nxos_devicealias/tasks/main.yaml

@@ -3,8 +3,6 @@
   register: result
   cisco.nxos.nxos_command:
     commands: show version | grep MDS
-  vars:
-    ansible_connection: ansible.netcommon.network_cli
 
 - name: Set skip_test flag to false
   ansible.builtin.set_fact: