Skip to content

Commit f0183b2

Browse files
resmoresmo
committed
fix instance tests
1 parent 5413316 commit f0183b2

File tree

6 files changed

+97
-93
lines changed

6 files changed

+97
-93
lines changed

‎plugins/modules/instance.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,10 @@ def restore_instance(self):
10931093
def get_result(self, resource):
10941094
super(AnsibleCloudStackInstance, self).get_result(resource)
10951095
if resource:
1096+
# 4.18 does not return keypairs as list as doc claims
1097+
if "ssh_keys" in self.result and not isinstance("list", self.result["ssh_keys"]):
1098+
self.result["ssh_keys"] = [self.result["ssh_keys"]]
1099+
10961100
self.result["user_data"] = self._get_instance_user_data(resource)
10971101
if "securitygroup" in resource:
10981102
security_groups = []

‎tests/integration/targets/instance/tasks/host.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
assert:
4949
that:
5050
- instance is changed
51-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
51+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
5252
- instance.host is not defined
5353
- instance.state == "Stopped"
5454

@@ -63,7 +63,7 @@
6363
assert:
6464
that:
6565
- instance is changed
66-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
66+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
6767
- instance.host == host.name
6868
- instance.state == "Running"
6969

@@ -78,7 +78,7 @@
7878
assert:
7979
that:
8080
- instance is not changed
81-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
81+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
8282
- instance.host == host.name
8383
- instance.state == "Running"
8484

@@ -101,7 +101,7 @@
101101
assert:
102102
that:
103103
- instance is changed
104-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
104+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
105105
- instance.host != host.name
106106
- instance.state == "Running"
107107

@@ -116,7 +116,7 @@
116116
assert:
117117
that:
118118
- instance is changed
119-
- instance.name cs_resource_prefix + "-vm-" + instance_number
119+
- instance.name cs_resource_prefix + "-vm-" + instance_number|string
120120
- instance.host == host.name
121121
- instance.state == "Running"
122122

@@ -131,7 +131,7 @@
131131
assert:
132132
that:
133133
- instance is not changed
134-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
135-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
134+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
135+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
136136
- instance.host == host.name
137137
- instance.state == "Running"

‎tests/integration/targets/instance/tasks/present.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
assert:
4848
that:
4949
- instance is changed
50-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
51-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
50+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
51+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
5252
- instance.service_offering == test_cs_instance_offering_1
5353
- instance.state == "Running"
5454
- instance.ssh_key == cs_resource_prefix + "-sshkey"
@@ -74,8 +74,8 @@
7474
assert:
7575
that:
7676
- instance is not changed
77-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
78-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
77+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
78+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
7979
- instance.service_offering == test_cs_instance_offering_1
8080
- instance.state == "Running"
8181
- instance.ssh_key == cs_resource_prefix + "-sshkey"
@@ -96,8 +96,8 @@
9696
assert:
9797
that:
9898
- instance is not changed
99-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
100-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
99+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
100+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
101101
- instance.service_offering == test_cs_instance_offering_1
102102
- instance.state == "Running"
103103

@@ -111,8 +111,8 @@
111111
assert:
112112
that:
113113
- instance is not changed
114-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
115-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
114+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
115+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
116116
- instance.service_offering == test_cs_instance_offering_1
117117
- instance.state == "Running"
118118

@@ -127,8 +127,8 @@
127127
assert:
128128
that:
129129
- instance is changed
130-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
131-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
130+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
131+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
132132
- instance.service_offering == test_cs_instance_offering_1
133133
- instance.state == "Running"
134134

@@ -142,8 +142,8 @@
142142
assert:
143143
that:
144144
- instance is changed
145-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
146-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
145+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
146+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
147147
- instance.service_offering == test_cs_instance_offering_1
148148
- instance.state == "Stopped"
149149

@@ -171,8 +171,8 @@
171171
assert:
172172
that:
173173
- instance is changed
174-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
175-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
174+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
175+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
176176
- instance.service_offering == test_cs_instance_offering_1
177177
- instance.state == "Stopped"
178178

@@ -187,8 +187,8 @@
187187
assert:
188188
that:
189189
- instance is changed
190-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
191-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
190+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
191+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
192192
- instance.service_offering == test_cs_instance_offering_2
193193
- instance.state == "Stopped"
194194

@@ -203,7 +203,7 @@
203203
assert:
204204
that:
205205
- instance is not changed
206-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
206+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
207207
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
208208
- instance.service_offering == test_cs_instance_offering_2
209209
- instance.state == "Stopped"
@@ -218,8 +218,8 @@
218218
assert:
219219
that:
220220
- instance is changed
221-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
222-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
221+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
222+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
223223
- instance.service_offering == test_cs_instance_offering_2
224224
- instance.state == "Running"
225225

@@ -233,8 +233,8 @@
233233
assert:
234234
that:
235235
- instance is not changed
236-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
237-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
236+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
237+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
238238
- instance.service_offering == test_cs_instance_offering_2
239239
- instance.state == "Running"
240240

@@ -250,8 +250,8 @@
250250
assert:
251251
that:
252252
- instance is changed
253-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
254-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
253+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
254+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
255255
- instance.service_offering == test_cs_instance_offering_2
256256
- instance.state == "Running"
257257

@@ -266,8 +266,8 @@
266266
assert:
267267
that:
268268
- instance is changed
269-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
270-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
269+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
270+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
271271
- instance.service_offering == test_cs_instance_offering_1
272272
- instance.state == "Running"
273273

@@ -282,8 +282,8 @@
282282
assert:
283283
that:
284284
- instance is not changed
285-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
286-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
285+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
286+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
287287
- instance.service_offering == test_cs_instance_offering_1
288288
- instance.state == "Running"
289289

@@ -299,8 +299,8 @@
299299
assert:
300300
that:
301301
- instance is changed
302-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
303-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
302+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
303+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
304304
- instance.service_offering == test_cs_instance_offering_1
305305

306306
- name: test restore instance
@@ -314,6 +314,6 @@
314314
assert:
315315
that:
316316
- instance is changed
317-
- instance.name == cs_resource_prefix + "-vm-" + instance_number
318-
- instance.display_name == cs_resource_prefix + "-display-" + instance_number
317+
- instance.name == cs_resource_prefix + "-vm-" + instance_number|string
318+
- instance.display_name == cs_resource_prefix + "-display-" + instance_number|string
319319
- instance.service_offering == test_cs_instance_offering_1

‎tests/integration/targets/instance/tasks/present_display_name.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
assert:
2525
that:
2626
- instance is changed
27-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
27+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
2828
- instance.service_offering == test_cs_instance_offering_1
2929
- instance.state == "Running"
3030
- instance.ssh_key == cs_resource_prefix + "-sshkey"
@@ -45,7 +45,7 @@
4545
assert:
4646
that:
4747
- instance is not changed
48-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
48+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
4949
- instance.service_offering == test_cs_instance_offering_1
5050
- instance.state == "Running"
5151
- instance.ssh_key == cs_resource_prefix + "-sshkey"
@@ -61,7 +61,7 @@
6161
assert:
6262
that:
6363
- instance is not changed
64-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
64+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
6565
- instance.service_offering == test_cs_instance_offering_1
6666
- instance.state == "Running"
6767

@@ -75,7 +75,7 @@
7575
assert:
7676
that:
7777
- instance is changed
78-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
78+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
7979
- instance.service_offering == test_cs_instance_offering_1
8080
- instance.state == "Stopped"
8181

@@ -101,7 +101,7 @@
101101
assert:
102102
that:
103103
- instance is changed
104-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
104+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
105105
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
106106
- instance.state == "Stopped"
107107

@@ -115,7 +115,7 @@
115115
assert:
116116
that:
117117
- instance is changed
118-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
118+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
119119
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
120120
- instance.state == "Running"
121121

@@ -129,7 +129,7 @@
129129
assert:
130130
that:
131131
- instance is not changed
132-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
132+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
133133
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
134134
- instance.state == "Running"
135135

@@ -144,7 +144,7 @@
144144
assert:
145145
that:
146146
- instance is changed
147-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
147+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
148148
- instance.service_offering == test_cs_instance_offering_1
149149
- instance.state == "Running"
150150

@@ -159,7 +159,7 @@
159159
assert:
160160
that:
161161
- instance is not changed
162-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
162+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
163163
- instance.service_offering == test_cs_instance_offering_1
164164
- instance.state == "Running"
165165

@@ -174,5 +174,5 @@
174174
assert:
175175
that:
176176
- instance is changed
177-
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number
177+
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
178178
- instance.service_offering == test_cs_instance_offering_1

0 commit comments

Comments
 (0)