Fixing issues with httpapi (#40388)

* I seem to have forgotten the back half of tests

* Set http timeout from persistent_command_timeout

* Tweak URL generation and provide URL on error

* Push var_options to connection process

* Don't wait forever if coming from persistent

* Don't send the entire contents of variables to ansible-connection

10 files changed, 0 insertions, 56 deletions

diff --git a/test/integration/targets/nxos_system/tests/cli/net_system.yaml b/test/integration/targets/nxos_system/tests/cli/net_system.yaml
index 2d1d4194de..483bcfdaec 100644
--- a/test/integration/targets/nxos_system/tests/cli/net_system.yaml
+++ b/test/integration/targets/nxos_system/tests/cli/net_system.yaml
@@ -10,14 +10,12 @@
       - no ip domain-list ansible.com
       - no ip domain-list redhat.com
     match: none
-    provider: "{{ cli }}"
 
 - name: configure domain_list using platform agnostic module
   net_system:
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -32,6 +30,5 @@
       - no ip domain-list ansible.com
       - no ip domain-list redhat.com
     match: none
-    provider: "{{ cli }}"
 
 - debug: msg="END nxos cli/net_system.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/nxos_system/tests/cli/set_domain_list.yaml b/test/integration/targets/nxos_system/tests/cli/set_domain_list.yaml
index 244d674681..6884b79f8b 100644
--- a/test/integration/targets/nxos_system/tests/cli/set_domain_list.yaml
+++ b/test/integration/targets/nxos_system/tests/cli/set_domain_list.yaml
@@ -7,14 +7,12 @@
       - no ip domain-list ansible.com
       - no ip domain-list redhat.com
     match: none
-    provider: "{{ cli }}"
 
 - name: configure domain_list
   nxos_system:
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -28,7 +26,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -39,7 +36,6 @@
   nxos_system:
     domain_search:
       - ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -51,7 +47,6 @@
   nxos_system:
     domain_search:
       - ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -63,7 +58,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -76,7 +70,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -88,7 +81,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -103,7 +95,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -117,6 +108,5 @@
       - no ip domain-list redhat.com
       - no ip domain-list eng.ansible.com
     match: none
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_domain_search.yaml"
diff --git a/test/integration/targets/nxos_system/tests/cli/set_domain_name.yaml b/test/integration/targets/nxos_system/tests/cli/set_domain_name.yaml
index 9e0e08d9a3..3c64cd5b31 100644
--- a/test/integration/targets/nxos_system/tests/cli/set_domain_name.yaml
+++ b/test/integration/targets/nxos_system/tests/cli/set_domain_name.yaml
@@ -5,12 +5,10 @@
   nxos_config:
     lines: no ip domain-name eng.ansible.com
     match: none
-    provider: "{{ cli }}"
 
 - name: configure domain_name
   nxos_system:
     domain_name: eng.ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -20,7 +18,6 @@
 - name: verify domain_name
   nxos_system:
     domain_name: eng.ansible.com
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -31,6 +28,5 @@
   nxos_config:
     lines: no ip domain-name eng.ansible.com
     match: none
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_domain_name.yaml"
diff --git a/test/integration/targets/nxos_system/tests/cli/set_name_servers.yaml b/test/integration/targets/nxos_system/tests/cli/set_name_servers.yaml
index f8114e83ca..7a593f6462 100644
--- a/test/integration/targets/nxos_system/tests/cli/set_name_servers.yaml
+++ b/test/integration/targets/nxos_system/tests/cli/set_name_servers.yaml
@@ -8,7 +8,6 @@
       - no ip name-server 2.2.2.2
       - no ip name-server 3.3.3.3
     match: none
-    provider: "{{ cli }}"
 
 - name: configure name_servers
   nxos_system:
@@ -16,7 +15,6 @@
       - 1.1.1.1
       - 2.2.2.2
       - 3.3.3.3
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -32,7 +30,6 @@
       - 1.1.1.1
       - 2.2.2.2
       - 3.3.3.3
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -45,7 +42,6 @@
 #      - 1.1.1.1
 #      - { server: 2.2.2.2, vrf: ansible }
 #      - 3.3.3.3
-#    provider: "{{ cli }}"
 #  register: result
 
 #- assert:
@@ -61,7 +57,6 @@
 #      - 1.1.1.1
 #      - { server: 2.2.2.2, vrf: ansible }
 #      - 3.3.3.3
-#    provider: "{{ cli }}"
 #  register: result
 #
 #- assert:
@@ -73,7 +68,6 @@
     name_servers:
       - 1.1.1.1
       - 2.2.2.2
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -87,7 +81,6 @@
     lines:
       - no ip lookup source-interface
     match: none
-    provider: "{{ cli }}"
   ignore_errors: yes
   # FIXME Copied from iosxr, not sure what we need here
 
diff --git a/test/integration/targets/nxos_system/tests/common/sanity.yaml b/test/integration/targets/nxos_system/tests/common/sanity.yaml
index 0b513699e0..642b42745f 100644
--- a/test/integration/targets/nxos_system/tests/common/sanity.yaml
+++ b/test/integration/targets/nxos_system/tests/common/sanity.yaml
@@ -8,26 +8,22 @@
     nxos_system: &hostname
       hostname: switch
       domain_name: test.example.com
-      provider: "{{ connection }}"
 
   - name: remove configuration
     nxos_system:
       state: absent
-      provider: "{{ connection }}"
 
   - name: configure name servers
     nxos_system:
       name_servers:
         - 8.8.8.8
         - 8.8.4.4
-      provider: "{{ connection }}"
 
   - name: configure name servers with VRF support
     nxos_system:
       name_servers:
         - { server: 8.8.8.8, vrf: management }
         - { server: 8.8.4.4, vrf: management }
-      provider: "{{ connection }}"
 
   always:
   - name: Re-configure hostname
diff --git a/test/integration/targets/nxos_system/tests/common/set_hostname.yaml b/test/integration/targets/nxos_system/tests/common/set_hostname.yaml
index 1521d46bc8..81c61a28f2 100644
--- a/test/integration/targets/nxos_system/tests/common/set_hostname.yaml
+++ b/test/integration/targets/nxos_system/tests/common/set_hostname.yaml
@@ -8,12 +8,10 @@
     nxos_config:
       lines: hostname switch
       match: none
-      provider: "{{ connection }}"
 
   - name: configure hostname
     nxos_system:
       hostname: foo
-      provider: "{{ connection }}"
     register: result
 
   - assert:
@@ -23,7 +21,6 @@
   - name: verify hostname
     nxos_system:
       hostname: foo
-      provider: "{{ connection }}"
     register: result
 
   - assert:
@@ -35,7 +32,6 @@
     nxos_config:
       lines: hostname switch
       match: none
-      provider: "{{ connection }}"
 
 
   - debug: msg="END connection={{ ansible_connection }}/set_hostname.yaml"
diff --git a/test/integration/targets/nxos_system/tests/nxapi/net_system.yaml b/test/integration/targets/nxos_system/tests/nxapi/net_system.yaml
index e808e9d78d..06bd8609a4 100644
--- a/test/integration/targets/nxos_system/tests/nxapi/net_system.yaml
+++ b/test/integration/targets/nxos_system/tests/nxapi/net_system.yaml
@@ -11,7 +11,6 @@
       - no ip domain-list ansible.com
       - no ip domain-list redhat.com
     match: none
-    provider: "{{ nxapi }}"
   ignore_errors: yes
 
 - name: configure domain_list using platform agnostic module
@@ -19,7 +18,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -34,6 +32,5 @@
       - no ip domain-list ansible.com
       - no ip domain-list redhat.com
     match: none
-    provider: "{{ nxapi }}"
 
 - debug: msg="END nxos nxapi/net_system.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/nxos_system/tests/nxapi/set_domain_list.yaml b/test/integration/targets/nxos_system/tests/nxapi/set_domain_list.yaml
index f19622f8a4..d22736c2e6 100644
--- a/test/integration/targets/nxos_system/tests/nxapi/set_domain_list.yaml
+++ b/test/integration/targets/nxos_system/tests/nxapi/set_domain_list.yaml
@@ -9,7 +9,6 @@
     lines:
       - no ip domain-list {{ item }}
     match: none
-    provider: "{{ nxapi }}"
   ignore_errors: yes
   with_items:
       - ansible.com
@@ -20,7 +19,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -34,7 +32,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -45,7 +42,6 @@
   nxos_system:
     domain_search:
       - ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -57,7 +53,6 @@
   nxos_system:
     domain_search:
       - ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -69,7 +64,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -82,7 +76,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -94,7 +87,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -109,7 +101,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -121,7 +112,6 @@
     lines:
       - no ip domain-list {{ item }}
     match: none
-    provider: "{{ nxapi }}"
   ignore_errors: yes
   with_items:
       - ansible.com
diff --git a/test/integration/targets/nxos_system/tests/nxapi/set_domain_name.yaml b/test/integration/targets/nxos_system/tests/nxapi/set_domain_name.yaml
index a0585b1e31..13adfcbf4b 100644
--- a/test/integration/targets/nxos_system/tests/nxapi/set_domain_name.yaml
+++ b/test/integration/targets/nxos_system/tests/nxapi/set_domain_name.yaml
@@ -5,14 +5,12 @@
   nxos_config:
     lines: no ip domain-name eng.ansible.com
     match: none
-    provider: "{{ nxapi }}"
 # NXAPI errors if you try to remove something that doesn't exist
   ignore_errors: yes
 
 - name: configure domain_name
   nxos_system:
     domain_name: eng.ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -22,7 +20,6 @@
 - name: verify domain_name
   nxos_system:
     domain_name: eng.ansible.com
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -33,6 +30,5 @@
   nxos_config:
     lines: no ip domain-name eng.ansible.com
     match: none
-    provider: "{{ nxapi }}"
 
 - debug: msg="END nxapi/set_domain_name.yaml"
diff --git a/test/integration/targets/nxos_system/tests/nxapi/set_name_servers.yaml b/test/integration/targets/nxos_system/tests/nxapi/set_name_servers.yaml
index 70879484eb..99fc9e791f 100644
--- a/test/integration/targets/nxos_system/tests/nxapi/set_name_servers.yaml
+++ b/test/integration/targets/nxos_system/tests/nxapi/set_name_servers.yaml
@@ -9,7 +9,6 @@
     lines:
       - no ip name-server {{ item }}
     match: none
-    provider: "{{ nxapi }}"
   ignore_errors: yes
   with_items:
       - 1.1.1.1
@@ -22,7 +21,6 @@
       - 1.1.1.1
       - 2.2.2.2
       - 3.3.3.3
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -38,7 +36,6 @@
       - 1.1.1.1
       - 2.2.2.2
       - 3.3.3.3
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -51,7 +48,6 @@
 #      - 1.1.1.1
 #      - { server: 2.2.2.2, vrf: ansible }
 #      - 3.3.3.3
-#    provider: "{{ nxapi }}"
 #  register: result
 
 #- assert:
@@ -67,7 +63,6 @@
 #      - 1.1.1.1
 #      - { server: 2.2.2.2, vrf: ansible }
 #      - 3.3.3.3
-#    provider: "{{ nxapi }}"
 #  register: result
 #
 #- assert:
@@ -79,7 +74,6 @@
     name_servers:
       - 1.1.1.1
       - 2.2.2.2
-    provider: "{{ nxapi }}"
   register: result
 
 - assert:
@@ -93,7 +87,6 @@
     lines:
       - no ip lookup source-interface
     match: none
-    provider: "{{ nxapi }}"
   ignore_errors: yes
   # FIXME Copied from iosxr, not sure what we need here