summaryrefslogtreecommitdiff
path: root/test/integration/targets/nxos_install_os/tasks
diff options
context:
space:
mode:
authornkshrishail <42039941+nkshrishail@users.noreply.github.com>2020-01-08 03:13:23 -0500
committerNilashish Chakraborty <nilashishchakraborty8@gmail.com>2020-01-08 13:43:23 +0530
commit01e4c41be4de5217fd10ab6e43322602c22eb357 (patch)
tree441cb33d5b65d4983b94b3ab652f9d7bb8baf6ab /test/integration/targets/nxos_install_os/tasks
parent45713aa38f7b4ca09f95f231c2914a53b7005d08 (diff)
downloadansible-01e4c41be4de5217fd10ab6e43322602c22eb357.tar.gz
nxos: Removing local-nxapi plugin and related parameters' usage from the integration tests. (#65068)
* nxos_integration_tests: Removing obsolete provider parameter * nxos: removing support for local-nxapi plugin * nxos: removing LocalNxapi plugin implementation * nxos_nxapi: removing local plugin usage * REVERT - nxos: removing LocalNxapi plugin implementation * Addressing yamllint issues * Removing the condition on the debug messages * Restoring changes done to nxos_nxapi* tests * Retaining timeout of 500 on nxos_smoke test * Some cleanup * Addressing latest comments * Restoring the nxos_smoke and removing timeout from nxos_config and nxos_rollback
Diffstat (limited to 'test/integration/targets/nxos_install_os/tasks')
-rw-r--r--test/integration/targets/nxos_install_os/tasks/main.yaml4
-rw-r--r--test/integration/targets/nxos_install_os/tasks/nxapi.yaml16
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/copy_kick_system_images.yaml1
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/delete_files.yaml1
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/enable_scp_server.yaml1
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/install_os.yaml1
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/install_system.yaml4
-rw-r--r--test/integration/targets/nxos_install_os/tasks/upgrade/install_with_kick.yaml3
8 files changed, 1 insertions, 30 deletions
diff --git a/test/integration/targets/nxos_install_os/tasks/main.yaml b/test/integration/targets/nxos_install_os/tasks/main.yaml
index 9199166cd5..0530efb6b3 100644
--- a/test/integration/targets/nxos_install_os/tasks/main.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/main.yaml
@@ -5,6 +5,4 @@
# Upgrade using NX-API
- include: httpapi.yaml
- when: ansible_connection == 'httpapi'
-- include: nxapi.yaml
- when: ansible_connection == 'local'
+ when: ansible_connection == 'httpapi' \ No newline at end of file
diff --git a/test/integration/targets/nxos_install_os/tasks/nxapi.yaml b/test/integration/targets/nxos_install_os/tasks/nxapi.yaml
deleted file mode 100644
index 51e03b8daf..0000000000
--- a/test/integration/targets/nxos_install_os/tasks/nxapi.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: collect common test cases
- find:
- paths: "{{ role_path }}/tests/common"
- patterns: "{{ testcase }}.yaml"
- connection: local
- register: test_cases
-
-- name: set test_items
- set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
-
-- name: run test cases (ansible_connection=local transport=nxapi)
- include: "{{ test_case_to_run }} ansible_connection=local connection={{ nxapi }}"
- with_items: "{{ test_items }}"
- loop_control:
- loop_var: test_case_to_run
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/copy_kick_system_images.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/copy_kick_system_images.yaml
index e1c57cad95..9e117835c7 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/copy_kick_system_images.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/copy_kick_system_images.yaml
@@ -8,7 +8,6 @@
- name: 'Remove SSH known_hosts file before scp of image file'
nxos_command:
commands: 'run bash rm /var/home/admin/.ssh/known_hosts'
- provider: "{{ connection }}"
ignore_errors: yes
- name: "Copy {{ si }} to bootflash"
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/delete_files.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/delete_files.yaml
index f72f31569f..27157b690b 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/delete_files.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/delete_files.yaml
@@ -6,6 +6,5 @@
- allow delete boot-image
- "delete {{ item }}"
match: none
- provider: "{{ connection }}"
ignore_errors: yes
with_items: "{{ delete_image_list }}"
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/enable_scp_server.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/enable_scp_server.yaml
index 4fcae4ca60..f8a4e54e34 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/enable_scp_server.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/enable_scp_server.yaml
@@ -3,4 +3,3 @@
nxos_feature:
feature: scp-server
state: enabled
- provider: "{{ connection }}"
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/install_os.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/install_os.yaml
index 2c0dac2639..a7d21a5117 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/install_os.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/install_os.yaml
@@ -19,7 +19,6 @@
- name: "Check installed OS for newly installed version {{ tv }}"
nxos_command:
commands: ['show version | json']
- provider: "{{ connection }}"
register: output
- debug: msg="Version detected {{ output['stdout_lines'][0]['kickstart_ver_str'] }}"
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/install_system.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/install_system.yaml
index 9b647f459b..09ed721649 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/install_system.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/install_system.yaml
@@ -4,7 +4,6 @@
nxos_install_os:
system_image_file: "{{ si }}"
issu: "{{ issu }}"
- provider: "{{ connection }}"
register: result
when: not force
@@ -15,7 +14,6 @@
- no boot kickstart
- no boot system
match: line
- provider: "{{ connection }}"
ignore_errors: yes
when: force
@@ -25,7 +23,6 @@
- "boot nxos bootflash:{{ si }}"
- copy run start
match: line
- provider: "{{ connection }}"
when: force
- name: "Boot image {{ si }} using reload"
@@ -33,7 +30,6 @@
lines:
- 'terminal dont-ask'
- 'reload'
- provider: "{{ connection }}"
ignore_errors: yes
when: force
diff --git a/test/integration/targets/nxos_install_os/tasks/upgrade/install_with_kick.yaml b/test/integration/targets/nxos_install_os/tasks/upgrade/install_with_kick.yaml
index 524a4a5df3..8d02cb9a78 100644
--- a/test/integration/targets/nxos_install_os/tasks/upgrade/install_with_kick.yaml
+++ b/test/integration/targets/nxos_install_os/tasks/upgrade/install_with_kick.yaml
@@ -5,7 +5,6 @@
system_image_file: "{{ si }}"
kickstart_image_file: "{{ ki }}"
issu: "{{ issu }}"
- provider: "{{ connection }}"
register: result
when: not force
@@ -18,13 +17,11 @@
- "boot system bootflash:{{ si }}"
- copy run start
match: line
- provider: "{{ connection }}"
when: force
- name: "Boot image {{ si }} using reload"
nxos_command:
commands: 'terminal dont-ask ; reload'
- provider: "{{ connection }}"
ignore_errors: yes
when: force