Skip to content

Commit c66bbe7

Browse files
committed
more instances fixes
1 parent b996458 commit c66bbe7

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
that:
103103
- instance is changed
104104
- instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string
105-
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
105+
- instance.service_offering == test_cs_instance_offering_2
106106
- instance.state == "Stopped"
107107

108108
- name: test starting instance with display_name

tests/integration/targets/instance/tasks/sshkeys.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
assert:
1313
that:
1414
- instance is failed
15-
- 'instance.msg == "SSH key not found:" + cs_resource_prefix + "-sshkey-does-not-exist"'
15+
- 'instance.msg == "SSH key not found: " + cs_resource_prefix + "-sshkey-does-not-exist"'
1616

1717
- name: test create instance without keypair in check mode
1818
ngine_io.cloudstack.instance:
@@ -25,7 +25,6 @@
2525
- name: verify create instance without keypair in check mode
2626
assert:
2727
that:
28-
- instance is successful
2928
- instance is changed
3029

3130
- name: test create instance without keypair
@@ -38,7 +37,6 @@
3837
- name: verify create instance without keypair
3938
assert:
4039
that:
41-
- instance is successful
4240
- instance is changed
4341
- instance.ssh_keys is not defined
4442

@@ -52,7 +50,6 @@
5250
- name: verify create instance without keypair idempotence
5351
assert:
5452
that:
55-
- instance is successful
5653
- instance is not changed
5754
- instance.ssh_keys is not defined
5855

@@ -127,7 +124,7 @@
127124
assert:
128125
that:
129126
- instance is failed
130-
- 'instance.msg == "SSH key not found: {{ cs_resource_prefix }}-sshkey2"'
127+
- 'instance.msg == "SSH key not found: " + cs_resource_prefix + "-sshkey2"'
131128

132129
- name: test update instance ssh key in check mode
133130
ngine_io.cloudstack.instance:

0 commit comments

Comments
 (0)