vmware: refactoring of vmware test roles -- part2 (#55724)

Refactoring of the following roles to make use of the new
`prepare_vmware_tests` role.

- `vmware_datacenter`
- `vmware_datastore_cluster`
- `vmware_datastore_facts`
- `vmware_datastore_maintenancemode`

This patch depends on: https://github.com/ansible/ansible/pull/55719

Original PR: https://github.com/ansible/ansible/pull/54882
This commit is contained in:
Gonéri Le Bouder 2019-04-30 06:22:50 -04:00 committed by ansibot
commit 0e83384dfd
8 changed files with 198 additions and 290 deletions

View file

@ -1,2 +1,3 @@
shippable/vcenter/group1
cloud/vcenter
needs/target/prepare_vmware_tests

View file

@ -2,45 +2,14 @@
# Copyright: (c) 2018, Abhijeet Kasurde <akasurde@redhat.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Wait for Flask controller to come up online
wait_for:
host: '{{ vcsim }}'
port: 5000
state: started
- name: Kill vcsim
uri:
url: http://{{ vcsim }}:5000/killall
- name: Start vcsim
uri:
url: http://{{ vcsim }}:5000/spawn?cluster=2
register: vcsim_instance
- name: Wait for Flask controller to come up online
wait_for:
host: '{{ vcsim }}'
port: 443
state: started
- debug:
var: vcsim_instance
- name: Get datacenter
uri:
url: http://{{ vcsim }}:5000/govc_find?filter=DC
register: datacenters
- name: store the vcenter container ip
set_fact:
dc1: "{{ datacenters['json'][0] | basename }}"
- import_role:
name: prepare_vmware_tests
- name: Add a datastore cluster to datacenter (check-mode)
vmware_datastore_cluster: &add_datastore_cluster
hostname: '{{ vcsim }}'
username: '{{ vcsim_instance.json.username }}'
password: '{{ vcsim_instance.json.password }}'
hostname: '{{ vcenter_hostname }}'
username: '{{ vcenter_username }}'
password: '{{ vcenter_password }}'
validate_certs: no
datacenter_name: "{{ dc1 }}"
datastore_cluster_name: DSC1
@ -50,7 +19,7 @@
- assert:
that:
- add_dsc_check.changed == true
- add_dsc_check.changed
- name: Add a datastore cluster to datacenter
vmware_datastore_cluster: *add_datastore_cluster
@ -58,7 +27,7 @@
- assert:
that:
- add_dsc.changed == true
- add_dsc.changed
- name: Add a datastore cluster to datacenter again
vmware_datastore_cluster: *add_datastore_cluster
@ -66,13 +35,13 @@
- assert:
that:
- add_dsc.changed == false
- not add_dsc.changed
- name: Delete a datastore cluster to datacenter (check-mode)
vmware_datastore_cluster: &delete_datastore_cluster
hostname: '{{ vcsim }}'
username: '{{ vcsim_instance.json.username }}'
password: '{{ vcsim_instance.json.password }}'
hostname: '{{ vcenter_hostname }}'
username: '{{ vcenter_username }}'
password: '{{ vcenter_password }}'
validate_certs: no
datacenter_name: "{{ dc1 }}"
datastore_cluster_name: DSC1
@ -82,13 +51,14 @@
- assert:
that:
- delete_dsc_check.changed == true
- delete_dsc_check.changed
# TODO: vcsim does not support delete operation on datastore cluster
#- name: Delete a datastore cluster to datacenter
# vmware_datastore_cluster: *delete_datastore_cluster
# register: delete_dsc_check
- when: vcsim is not defined
block:
- name: Delete a datastore cluster to datacenter
vmware_datastore_cluster: *delete_datastore_cluster
register: delete_dsc_check
#- assert:
# that:
# - delete_dsc_check.changed == true
- assert:
that:
- delete_dsc_check.changed