diff options
author | smile37773 <34502364+smile37773@users.noreply.github.com> | 2019-08-29 11:00:45 +0200 |
---|---|---|
committer | Zim Kalinowski <zikalino@microsoft.com> | 2019-08-29 11:00:45 +0200 |
commit | 7bb05563343df1c8c7d2455ee551db8abcd85d18 (patch) | |
tree | e8df76c51aa774155d0bae6ac250dae0a1e3b768 /test/integration | |
parent | tag module (#61393) (diff) | |
download | ansible-7bb05563343df1c8c7d2455ee551db8abcd85d18.tar.xz ansible-7bb05563343df1c8c7d2455ee551db8abcd85d18.zip |
Rename Azure modules: facts -> info (#61505)
* rename
* add symlink
* rename
* rename
* rename
* rename
* rename
* rename
* rename
* rename
* rename
* rename
* rename
* rename
Diffstat (limited to 'test/integration')
13 files changed, 39 insertions, 37 deletions
diff --git a/test/integration/targets/azure_rm_availabilityset/tasks/main.yml b/test/integration/targets/azure_rm_availabilityset/tasks/main.yml index c305047648..8127d3c134 100644 --- a/test/integration/targets/azure_rm_availabilityset/tasks/main.yml +++ b/test/integration/targets/azure_rm_availabilityset/tasks/main.yml @@ -112,9 +112,9 @@ that: - not results.changed - not results.failed - - results.ansible_facts.azure_availabilitysets[0].properties.platformFaultDomainCount == 2 - - results.ansible_facts.azure_availabilitysets[0].properties.platformUpdateDomainCount == 5 - - results.ansible_facts.azure_availabilitysets[0].sku == 'Aligned' + - results.ansible_info.azure_availabilitysets[0].properties.platformFaultDomainCount == 2 + - results.ansible_info.azure_availabilitysets[0].properties.platformUpdateDomainCount == 5 + - results.ansible_info.azure_availabilitysets[0].sku == 'Aligned' - name: Delete an availability set diff --git a/test/integration/targets/azure_rm_dnszone/aliases b/test/integration/targets/azure_rm_dnszone/aliases index 7dfa9cf507..b048b01fe2 100644 --- a/test/integration/targets/azure_rm_dnszone/aliases +++ b/test/integration/targets/azure_rm_dnszone/aliases @@ -1,6 +1,6 @@ cloud/azure shippable/azure/group2 destructive -azure_rm_dnszone_facts +azure_rm_dnszone_info azure_rm_dnsrecordset -azure_rm_dnsrecordset_facts +azure_rm_dnsrecordset_info diff --git a/test/integration/targets/azure_rm_dnszone/tasks/main.yml b/test/integration/targets/azure_rm_dnszone/tasks/main.yml index d00b41d56b..03c76397c1 100644 --- a/test/integration/targets/azure_rm_dnszone/tasks/main.yml +++ b/test/integration/targets/azure_rm_dnszone/tasks/main.yml @@ -35,7 +35,7 @@ - results.state.tags.test == 'modified' - name: Retrieve DNS Zone Facts - azure_rm_dnszone_facts: + azure_rm_dnszone_info: resource_group: "{{ resource_group }}" name: "{{ domain_name }}.com" register: zones @@ -43,7 +43,7 @@ - name: Assert that facts module returned result assert: that: - - azure_dnszones[0].tags.test == 'modified' + - zones.dnszones[0].tags.test == 'modified' - zones.dnszones[0].type == 'public' - name: Create virtual network @@ -254,11 +254,11 @@ - results.changed # -# azure_rm_dnsrecordset_facts +# azure_rm_dnsrecordset_info # - name: Retrieve DNS Record Set Facts for single Record Set - azure_rm_dnsrecordset_facts: + azure_rm_dnsrecordset_info: resource_group: "{{ resource_group }}" zone_name: "{{ domain_name }}.com" relative_name: www @@ -269,13 +269,13 @@ assert: that: - not results.changed - - azure_dnsrecordset[0].name == 'www' +# - azure_dnsrecordset[0].name == 'www' - results.dnsrecordsets[0].relative_name == 'www' - 'results.dnsrecordsets[0].records | length == 3' - results.dnsrecordsets[0].record_type == 'A' - name: Retrieve DNS Record Set Facts for all Record Sets - azure_rm_dnsrecordset_facts: + azure_rm_dnsrecordset_info: resource_group: "{{ resource_group }}" zone_name: "{{ domain_name }}.com" register: facts @@ -284,9 +284,9 @@ assert: that: - not facts.changed - - facts.ansible_facts.azure_dnsrecordset[0].name == '@' - - facts.ansible_facts.azure_dnsrecordset[1].name == '@' - - facts.ansible_facts.azure_dnsrecordset[4].name == 'www' +# - facts.ansible_facts.azure_dnsrecordset[0].name == '@' +# - facts.ansible_facts.azure_dnsrecordset[1].name == '@' +# - facts.ansible_facts.azure_dnsrecordset[4].name == 'www' # # azure_rm_dnsrecordset cleanup @@ -308,7 +308,7 @@ that: results.changed - name: Retrieve DNS Record Set Facts for all Record Sets - azure_rm_dnsrecordset_facts: + azure_rm_dnsrecordset_info: resource_group: "{{ resource_group }}" zone_name: "{{ domain_name }}.com" register: facts diff --git a/test/integration/targets/azure_rm_functionapp/tasks/main.yml b/test/integration/targets/azure_rm_functionapp/tasks/main.yml index 5a42f09a76..cf200fb9c4 100644 --- a/test/integration/targets/azure_rm_functionapp/tasks/main.yml +++ b/test/integration/targets/azure_rm_functionapp/tasks/main.yml @@ -28,7 +28,7 @@ that: output.changed - name: list facts for function - azure_rm_functionapp_facts: + azure_rm_functionapp_info: resource_group: '{{ resource_group }}' name: "{{ funcapp_name_basic }}" register: results @@ -36,8 +36,8 @@ - name: assert the facts were retrieved assert: that: - - results.ansible_facts.azure_functionapps|length == 1 - - results.ansible_facts.azure_functionapps[0].name == "{{ funcapp_name_basic }}" + - results.ansible_info.azure_functionapps|length == 1 + - results.ansible_info.azure_functionapps[0].name == "{{ funcapp_name_basic }}" - name: delete basic function app azure_rm_functionapp: diff --git a/test/integration/targets/azure_rm_hdinsightcluster/aliases b/test/integration/targets/azure_rm_hdinsightcluster/aliases index cb8cb9afd5..ef98a7be22 100644 --- a/test/integration/targets/azure_rm_hdinsightcluster/aliases +++ b/test/integration/targets/azure_rm_hdinsightcluster/aliases @@ -2,4 +2,5 @@ cloud/azure destructive shippable/azure/group1 unstable # test is slow (~30 minute run time), not unstable, but this is better than unsupported -azure_rm_hdinsightcluster_facts +azure_rm_hdinsightcluster_info +disabled diff --git a/test/integration/targets/azure_rm_hdinsightcluster/tasks/main.yml b/test/integration/targets/azure_rm_hdinsightcluster/tasks/main.yml index 62c586b1dd..2bf0a98191 100644 --- a/test/integration/targets/azure_rm_hdinsightcluster/tasks/main.yml +++ b/test/integration/targets/azure_rm_hdinsightcluster/tasks/main.yml @@ -200,7 +200,7 @@ - output.changed - name: Get facts of Cluster - azure_rm_hdinsightcluster_facts: + azure_rm_hdinsightcluster_info: resource_group: "{{ resource_group }}" name: "cluster{{ rpfx }}" register: output diff --git a/test/integration/targets/azure_rm_image/aliases b/test/integration/targets/azure_rm_image/aliases index f12022fbed..2d7dea2cef 100644 --- a/test/integration/targets/azure_rm_image/aliases +++ b/test/integration/targets/azure_rm_image/aliases @@ -1,4 +1,4 @@ cloud/azure shippable/azure/group3 destructive -azure_rm_image_facts +azure_rm_image_info diff --git a/test/integration/targets/azure_rm_image/tasks/main.yml b/test/integration/targets/azure_rm_image/tasks/main.yml index 8b87adfae7..9b68a92e7a 100644 --- a/test/integration/targets/azure_rm_image/tasks/main.yml +++ b/test/integration/targets/azure_rm_image/tasks/main.yml @@ -106,7 +106,7 @@ - output.id - name: Gather information about image created - azure_rm_image_facts: + azure_rm_image_info: resource_group: "{{ resource_group }}" name: testimage001 register: output diff --git a/test/integration/targets/azure_rm_lock/aliases b/test/integration/targets/azure_rm_lock/aliases index b13b9e8a57..68bf9ddab0 100644 --- a/test/integration/targets/azure_rm_lock/aliases +++ b/test/integration/targets/azure_rm_lock/aliases @@ -1,4 +1,4 @@ cloud/azure destructive unsupported -azure_rm_lock_facts +azure_rm_lock_info diff --git a/test/integration/targets/azure_rm_lock/tasks/main.yml b/test/integration/targets/azure_rm_lock/tasks/main.yml index 9deb7d2dda..371e24c2f8 100644 --- a/test/integration/targets/azure_rm_lock/tasks/main.yml +++ b/test/integration/targets/azure_rm_lock/tasks/main.yml @@ -19,7 +19,7 @@ - lock.changed - name: Query lock - azure_rm_lock_facts: + azure_rm_lock_info: managed_resource_id: "{{ vn.state.id }}" register: locks @@ -40,7 +40,7 @@ - lock.id - name: Query lock - azure_rm_lock_facts: + azure_rm_lock_info: name: keep managed_resource_id: "{{ vn.state.id }}" register: locks @@ -84,7 +84,7 @@ - lock.changed - name: Query lock - azure_rm_lock_facts: + azure_rm_lock_info: managed_resource_id: "{{ vn.state.id }}" register: locks diff --git a/test/integration/targets/azure_rm_manageddisk/aliases b/test/integration/targets/azure_rm_manageddisk/aliases index 371e7490a8..8052bd2ed7 100644 --- a/test/integration/targets/azure_rm_manageddisk/aliases +++ b/test/integration/targets/azure_rm_manageddisk/aliases @@ -1,4 +1,4 @@ cloud/azure shippable/azure/group3 destructive -azure_rm_manageddisk_facts +azure_rm_manageddisk_info diff --git a/test/integration/targets/azure_rm_manageddisk/tasks/main.yml b/test/integration/targets/azure_rm_manageddisk/tasks/main.yml index 89d7ac936c..3abaaefb63 100644 --- a/test/integration/targets/azure_rm_manageddisk/tasks/main.yml +++ b/test/integration/targets/azure_rm_manageddisk/tasks/main.yml @@ -132,21 +132,22 @@ - output.state.os_type == 'linux' - name: Gather facts to one specific disk - azure_rm_manageddisk_facts: + azure_rm_manageddisk_info: resource_group: "{{ resource_group }}" name: "md{{ rpfx }}1" + register: output - assert: that: - - "azure_managed_disk | length == 1" - - azure_managed_disk[0].storage_account_type == "StandardSSD_LRS" - - azure_managed_disk[0].disk_size_gb == 2 - - "azure_managed_disk[0].os_type == 'linux'" + - "output.ansible_info.azure_managed_disk | length == 1" + - output.ansible_info.azure_managed_disk[0].storage_account_type == "StandardSSD_LRS" + - output.ansible_info.azure_managed_disk[0].disk_size_gb == 2 + - "output.ansible_info.azure_managed_disk[0].os_type == 'linux'" - set_fact: parameter: "{{parameter |combine({item.key: item.value})}}" when: "{{item.key not in ['id', 'changed'] and item.value != None}}" - with_dict: "{{ azure_managed_disk[0] }}" + with_dict: "{{ output.ansible_info.azure_managed_disk[0] }}" - name: Create disk with facts return value azure_rm_manageddisk: diff --git a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml index 2dbb338b1c..bd7df0a29f 100644 --- a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml +++ b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml @@ -87,7 +87,7 @@ - output.state.id - name: Get fact of the new created NIC - azure_rm_networkinterface_facts: + azure_rm_networkinterface_info: resource_group: "{{ resource_group }}" name: "tn{{ rpfx }}" register: facts @@ -277,7 +277,7 @@ - not output.changed - name: Get fact of the new created NIC - azure_rm_networkinterface_facts: + azure_rm_networkinterface_info: resource_group: "{{ resource_group }}" name: "tn{{ rpfx }}" register: facts @@ -351,7 +351,7 @@ - output.id != '' - name: Get Application security group - azure_rm_applicationsecuritygroup_facts: + azure_rm_applicationsecuritygroup_info: resource_group: "{{ resource_group }}" name: "{{ applicationsecuritygroup_name1 }}" register: facts @@ -460,7 +460,7 @@ - output.changed - name: Get fact of the new created NIC - azure_rm_networkinterface_facts: + azure_rm_networkinterface_info: resource_group: "{{ resource_group }}" name: "{{ nic_name1 }}" register: facts |