Skip to content

Commit be2a049

Browse files
authored
Deprecate first zone as default zone
Test container 1.4.0
1 parent 43ec879 commit be2a049

File tree

18 files changed

+178
-26
lines changed

18 files changed

+178
-26
lines changed

.github/workflows/integration.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
integration-test:
13-
name: Integration test group${{matrix.group}} Py${{ matrix.python-version }}
13+
name: Integration v${{ matrix.container-version }} Ansible-${{ matrix.ansible-branch }} group${{ matrix.group }} Py${{ matrix.python-version }}
1414
defaults:
1515
run:
1616
working-directory: ansible_collections/ngine_io/cloudstack
@@ -24,6 +24,11 @@ jobs:
2424
group:
2525
- 1
2626
- 2
27+
ansible-branch:
28+
- devel
29+
container-version:
30+
- 1.4.0
31+
- 1.2.0
2732
steps:
2833
- name: Check out code
2934
uses: actions/checkout@v2
@@ -38,7 +43,7 @@ jobs:
3843
- name: Install ansible and collection dependencies
3944
run: |
4045
python -m pip install --upgrade pip
41-
pip install ansible
46+
pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-branch }}.tar.gz
4247
pip install -r requirements.txt
4348
4449
- name: Build and install collection
@@ -59,6 +64,8 @@ jobs:
5964
--continue-on-error
6065
--coverage
6166
shippable/cs/group${{ matrix.group }}/
67+
env:
68+
ANSIBLE_CLOUDSTACK_CONTAINER: quay.io/ansible/cloudstack-test-container:${{ matrix.container-version }}
6269

6370
- name: Generate coverage report.
6471
run: >-

plugins/module_utils/cloudstack.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,11 @@ def get_zone(self, key=None):
478478

479479
# use the first zone if no zone param given
480480
if not zone:
481+
self.module.deprecate(
482+
msg="Using first zone as default is deprecated because of unreliable API, zone needs to be defined.",
483+
version="2.0.0",
484+
collection_name="ngine_io.cloudstack"
485+
)
481486
self.zone = zones['zone'][0]
482487
self.result['zone'] = self.zone['name']
483488
return self._get_by_key(key, self.zone)

plugins/modules/cs_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ def main():
691691
),
692692
hypervisor=dict(),
693693
requires_hvm=dict(type='bool'),
694-
password_enabled=dict(type='bool'),
694+
password_enabled=dict(type='bool', no_log=False),
695695
template_tag=dict(),
696696
sshkey_enabled=dict(type='bool'),
697697
format=dict(choices=['QCOW2', 'RAW', 'VHD', 'OVA']),

tests/integration/targets/cs_cluster/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- name: setup cluster is absent
33
cs_cluster:
44
name: "{{ cs_resource_prefix }}-cluster"
5+
zone: "{{ cs_resource_prefix }}-zone"
56
state: absent
67
register: cluster
78
- name: verify setup cluster is absent
@@ -36,6 +37,7 @@
3637

3738
- name: test fail if missing name
3839
cs_cluster:
40+
zone: "{{ cs_resource_prefix }}-zone"
3941
register: cluster
4042
ignore_errors: true
4143
- name: verify results of fail if missing name
@@ -170,6 +172,7 @@
170172
- name: test disable cluster in check mode
171173
cs_cluster:
172174
name: "{{ cs_resource_prefix }}-cluster"
175+
zone: "{{ cs_resource_prefix }}-zone"
173176
state: disabled
174177
register: cluster
175178
check_mode: true
@@ -187,6 +190,7 @@
187190
- name: test disable cluster
188191
cs_cluster:
189192
name: "{{ cs_resource_prefix }}-cluster"
193+
zone: "{{ cs_resource_prefix }}-zone"
190194
state: disabled
191195
register: cluster
192196
- name: verify test disable cluster
@@ -203,6 +207,7 @@
203207
- name: test disable cluster idempotence
204208
cs_cluster:
205209
name: "{{ cs_resource_prefix }}-cluster"
210+
zone: "{{ cs_resource_prefix }}-zone"
206211
state: disabled
207212
register: cluster
208213
- name: verify test disable cluster idempotence
@@ -218,6 +223,7 @@
218223
- name: test enable cluster in check mode
219224
cs_cluster:
220225
name: "{{ cs_resource_prefix }}-cluster"
226+
zone: "{{ cs_resource_prefix }}-zone"
221227
state: enabled
222228
register: cluster
223229
check_mode: true
@@ -235,6 +241,7 @@
235241
- name: test enable cluster
236242
cs_cluster:
237243
name: "{{ cs_resource_prefix }}-cluster"
244+
zone: "{{ cs_resource_prefix }}-zone"
238245
state: enabled
239246
register: cluster
240247
- name: verify test enable cluster
@@ -251,6 +258,7 @@
251258
- name: test enable cluster idempotence
252259
cs_cluster:
253260
name: "{{ cs_resource_prefix }}-cluster"
261+
zone: "{{ cs_resource_prefix }}-zone"
254262
state: enabled
255263
register: cluster
256264
- name: verify test enable cluster idempotence

tests/integration/targets/cs_host/tasks/main.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: test fail missing params
33
cs_host:
4+
zone: "{{ cs_common_zone_basic }}"
45
register: host
56
ignore_errors: true
67
- name: verify test fail missing url if host is not existent
@@ -12,6 +13,7 @@
1213
- name: test fail missing params if host is not existent
1314
cs_host:
1415
name: sim
16+
zone: "{{ cs_common_zone_basic }}"
1517
register: host
1618
ignore_errors: true
1719
- name: verify test fail missing params if host is not existent
@@ -23,6 +25,7 @@
2325
- name: test create a host in check mode
2426
cs_host:
2527
name: sim
28+
zone: "{{ cs_common_zone_basic }}"
2629
url: "http://sim/c0-basic/h2"
2730
cluster: C0-basic
2831
pod: POD0-basic
@@ -43,6 +46,7 @@
4346
- name: test create a host
4447
cs_host:
4548
name: sim
49+
zone: "{{ cs_common_zone_basic }}"
4650
url: "http://sim/c0-basic/h2"
4751
cluster: C0-basic
4852
pod: POD0-basic
@@ -77,6 +81,7 @@
7781
- name: test create a host idempotence
7882
cs_host:
7983
name: "{{ host_hostname }}"
84+
zone: "{{ cs_common_zone_basic }}"
8085
url: "http://sim/c0-basic/h2"
8186
cluster: C0-basic
8287
pod: POD0-basic
@@ -104,6 +109,7 @@
104109
- name: test update host in check mode
105110
cs_host:
106111
name: "{{ host_hostname }}"
112+
zone: "{{ cs_common_zone_basic }}"
107113
url: "http://sim/c0-basic/h2"
108114
cluster: C0-basic
109115
pod: POD0-basic
@@ -133,6 +139,7 @@
133139
- name: test update host
134140
cs_host:
135141
name: "{{ host_hostname }}"
142+
zone: "{{ cs_common_zone_basic }}"
136143
url: "http://sim/c0-basic/h2"
137144
cluster: C0-basic
138145
pod: POD0-basic
@@ -161,6 +168,7 @@
161168
- name: test update host idempotence
162169
cs_host:
163170
name: "{{ host_hostname }}"
171+
zone: "{{ cs_common_zone_basic }}"
164172
url: "http://sim/c0-basic/h2"
165173
cluster: C0-basic
166174
pod: POD0-basic
@@ -190,6 +198,7 @@
190198
- name: test update host remove host_tags
191199
cs_host:
192200
name: "{{ host_hostname }}"
201+
zone: "{{ cs_common_zone_basic }}"
193202
url: "http://sim/c0-basic/h2"
194203
cluster: C0-basic
195204
pod: POD0-basic
@@ -218,6 +227,7 @@
218227
- name: test update host remove host_tags idempotence
219228
cs_host:
220229
name: "{{ host_hostname }}"
230+
zone: "{{ cs_common_zone_basic }}"
221231
url: "http://sim/c0-basic/h2"
222232
cluster: C0-basic
223233
pod: POD0-basic
@@ -246,6 +256,7 @@
246256
- name: test put host in maintenance in check mode
247257
cs_host:
248258
name: "{{ host_hostname }}"
259+
zone: "{{ cs_common_zone_basic }}"
249260
cluster: C0-basic
250261
pod: POD0-basic
251262
allocation_state: maintenance
@@ -267,6 +278,7 @@
267278
- name: test put host in maintenance
268279
cs_host:
269280
name: "{{ host_hostname }}"
281+
zone: "{{ cs_common_zone_basic }}"
270282
cluster: C0-basic
271283
pod: POD0-basic
272284
allocation_state: maintenance
@@ -287,6 +299,7 @@
287299
- name: test put host in maintenance idempotence
288300
cs_host:
289301
name: "{{ host_hostname }}"
302+
zone: "{{ cs_common_zone_basic }}"
290303
cluster: C0-basic
291304
pod: POD0-basic
292305
allocation_state: maintenance
@@ -307,6 +320,7 @@
307320
- name: test put host out of maintenance in check mode
308321
cs_host:
309322
name: "{{ host_hostname }}"
323+
zone: "{{ cs_common_zone_basic }}"
310324
cluster: C0-basic
311325
pod: POD0-basic
312326
allocation_state: enabled
@@ -328,6 +342,7 @@
328342
- name: test put host out of maintenance
329343
cs_host:
330344
name: "{{ host_hostname }}"
345+
zone: "{{ cs_common_zone_basic }}"
331346
cluster: C0-basic
332347
pod: POD0-basic
333348
allocation_state: enabled
@@ -348,6 +363,7 @@
348363
- name: test put host out of maintenance idempotence
349364
cs_host:
350365
name: "{{ host_hostname }}"
366+
zone: "{{ cs_common_zone_basic }}"
351367
cluster: C0-basic
352368
pod: POD0-basic
353369
allocation_state: enabled
@@ -368,6 +384,7 @@
368384
- name: test remove host in check mode
369385
cs_host:
370386
name: "{{ host_hostname }}"
387+
zone: "{{ cs_common_zone_basic }}"
371388
cluster: C0-basic
372389
pod: POD0-basic
373390
state: absent
@@ -389,6 +406,7 @@
389406
- name: test remove host
390407
cs_host:
391408
name: "{{ host_hostname }}"
409+
zone: "{{ cs_common_zone_basic }}"
392410
cluster: C0-basic
393411
pod: POD0-basic
394412
state: absent
@@ -409,6 +427,7 @@
409427
- name: test remove host idempotence
410428
cs_host:
411429
name: "{{ host_hostname }}"
430+
zone: "{{ cs_common_zone_basic }}"
412431
cluster: C0-basic
413432
pod: POD0-basic
414433
state: absent

tests/integration/targets/cs_instance/tasks/absent.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- name: test destroy instance in check mode
33
cs_instance:
44
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
5+
zone: "{{ cs_common_zone_basic }}"
56
state: absent
67
register: instance
78
check_mode: true
@@ -15,6 +16,7 @@
1516
- name: test destroy instance
1617
cs_instance:
1718
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
19+
zone: "{{ cs_common_zone_basic }}"
1820
state: absent
1921
register: instance
2022
- name: verify destroy instance
@@ -27,6 +29,7 @@
2729
- name: test destroy instance idempotence
2830
cs_instance:
2931
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
32+
zone: "{{ cs_common_zone_basic }}"
3033
state: absent
3134
register: instance
3235
- name: verify destroy instance idempotence
@@ -38,6 +41,7 @@
3841
- name: test recover to stopped state and update a deleted instance in check mode
3942
cs_instance:
4043
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
44+
zone: "{{ cs_common_zone_basic }}"
4145
service_offering: "{{ test_cs_instance_offering_1 }}"
4246
state: stopped
4347
register: instance
@@ -51,6 +55,7 @@
5155
- name: test recover to stopped state and update a deleted instance
5256
cs_instance:
5357
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
58+
zone: "{{ cs_common_zone_basic }}"
5459
service_offering: "{{ test_cs_instance_offering_1 }}"
5560
state: stopped
5661
register: instance
@@ -65,6 +70,7 @@
6570
- name: test recover to stopped state and update a deleted instance idempotence
6671
cs_instance:
6772
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
73+
zone: "{{ cs_common_zone_basic }}"
6874
service_offering: "{{ test_cs_instance_offering_1 }}"
6975
state: stopped
7076
register: instance
@@ -79,6 +85,7 @@
7985
- name: test expunge instance in check mode
8086
cs_instance:
8187
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
88+
zone: "{{ cs_common_zone_basic }}"
8289
state: expunged
8390
register: instance
8491
check_mode: true
@@ -93,6 +100,7 @@
93100
- name: test expunge instance
94101
cs_instance:
95102
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
103+
zone: "{{ cs_common_zone_basic }}"
96104
state: expunged
97105
register: instance
98106
- name: verify test expunge instance
@@ -106,6 +114,7 @@
106114
- name: test expunge instance idempotence
107115
cs_instance:
108116
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
117+
zone: "{{ cs_common_zone_basic }}"
109118
state: expunged
110119
register: instance
111120
- name: verify test expunge instance idempotence

tests/integration/targets/cs_instance/tasks/absent_display_name.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- name: test destroy instance with display_name
33
cs_instance:
44
display_name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
5+
zone: "{{ cs_common_zone_basic }}"
56
state: absent
67
register: instance
78
- name: verify destroy instance with display_name
@@ -14,6 +15,7 @@
1415
- name: test destroy instance with display_name idempotence
1516
cs_instance:
1617
display_name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
18+
zone: "{{ cs_common_zone_basic }}"
1719
state: absent
1820
register: instance
1921
- name: verify destroy instance with display_name idempotence
@@ -25,6 +27,7 @@
2527
- name: test recover to stopped state and update a deleted instance with display_name
2628
cs_instance:
2729
display_name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
30+
zone: "{{ cs_common_zone_basic }}"
2831
service_offering: "{{ test_cs_instance_offering_1 }}"
2932
state: stopped
3033
register: instance
@@ -39,5 +42,6 @@
3942
# force expunge, only works with admin permissions
4043
- cs_instance:
4144
display_name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
45+
zone: "{{ cs_common_zone_basic }}"
4246
state: expunged
4347
failed_when: false

0 commit comments

Comments
 (0)