From 9fd1e16dea5a502bd033d2d6fdb80cfcfccee435 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Mon, 25 Nov 2024 22:01:16 +0100 Subject: [PATCH] fix instance tests --- plugins/modules/instance.py | 4 + .../targets/instance/tasks/host.yml | 14 ++-- .../targets/instance/tasks/present.yml | 68 +++++++-------- .../instance/tasks/present_display_name.yml | 24 +++--- .../targets/instance/tasks/project.yml | 84 +++++++++---------- .../targets/instance/tasks/sshkeys.yml | 10 +-- 6 files changed, 104 insertions(+), 100 deletions(-) diff --git a/plugins/modules/instance.py b/plugins/modules/instance.py index 5e0e4218..2b29dcbf 100644 --- a/plugins/modules/instance.py +++ b/plugins/modules/instance.py @@ -1093,6 +1093,10 @@ def restore_instance(self): def get_result(self, resource): super(AnsibleCloudStackInstance, self).get_result(resource) if resource: + # 4.18 does not return keypairs as list as doc claims + if "ssh_keys" in self.result and not isinstance(self.result["ssh_keys"], list): + self.result["ssh_keys"] = [self.result["ssh_keys"]] + self.result["user_data"] = self._get_instance_user_data(resource) if "securitygroup" in resource: security_groups = [] diff --git a/tests/integration/targets/instance/tasks/host.yml b/tests/integration/targets/instance/tasks/host.yml index 594ef0c4..4730bdd6 100644 --- a/tests/integration/targets/instance/tasks/host.yml +++ b/tests/integration/targets/instance/tasks/host.yml @@ -48,7 +48,7 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.host is not defined - instance.state == "Stopped" @@ -63,7 +63,7 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.host == host.name - instance.state == "Running" @@ -78,7 +78,7 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.host == host.name - instance.state == "Running" @@ -101,7 +101,7 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.host != host.name - instance.state == "Running" @@ -116,7 +116,7 @@ assert: that: - instance is changed - - instance.name cs_resource_prefix + "-vm-" + instance_number + - instance.name cs_resource_prefix + "-vm-" + instance_number|string - instance.host == host.name - instance.state == "Running" @@ -131,7 +131,7 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.host == host.name - instance.state == "Running" diff --git a/tests/integration/targets/instance/tasks/present.yml b/tests/integration/targets/instance/tasks/present.yml index 966ea5c3..b6081589 100644 --- a/tests/integration/targets/instance/tasks/present.yml +++ b/tests/integration/targets/instance/tasks/present.yml @@ -47,11 +47,11 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - not instance.tags - name: test create instance idempotence @@ -74,11 +74,11 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - not instance.tags - name: gather host infos of running instance @@ -96,8 +96,8 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -111,8 +111,8 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -127,8 +127,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -142,8 +142,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Stopped" @@ -171,8 +171,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Stopped" @@ -187,8 +187,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Stopped" @@ -203,8 +203,8 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}" + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Stopped" @@ -218,8 +218,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -233,8 +233,8 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -250,8 +250,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -266,8 +266,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -282,8 +282,8 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -299,8 +299,8 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - name: test restore instance @@ -314,6 +314,6 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 diff --git a/tests/integration/targets/instance/tasks/present_display_name.yml b/tests/integration/targets/instance/tasks/present_display_name.yml index b354ffca..e2d688e2 100644 --- a/tests/integration/targets/instance/tasks/present_display_name.yml +++ b/tests/integration/targets/instance/tasks/present_display_name.yml @@ -24,10 +24,10 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - not instance.tags - name: test create instance with display_name idempotence @@ -45,10 +45,10 @@ assert: that: - instance is not changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - not instance.tags - name: test running instance with display_name not updated @@ -61,7 +61,7 @@ assert: that: - instance is not changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -75,7 +75,7 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Stopped" @@ -101,7 +101,7 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == "{{ test_cs_instance_offering_2 }}" - instance.state == "Stopped" @@ -115,7 +115,7 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == "{{ test_cs_instance_offering_2 }}" - instance.state == "Running" @@ -129,7 +129,7 @@ assert: that: - instance is not changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == "{{ test_cs_instance_offering_2 }}" - instance.state == "Running" @@ -144,7 +144,7 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -159,7 +159,7 @@ assert: that: - instance is not changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -174,5 +174,5 @@ assert: that: - instance is changed - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 diff --git a/tests/integration/targets/instance/tasks/project.yml b/tests/integration/targets/instance/tasks/project.yml index d1a3e6de..7cfab223 100644 --- a/tests/integration/targets/instance/tasks/project.yml +++ b/tests/integration/targets/instance/tasks/project.yml @@ -20,7 +20,7 @@ that: - name: setup ssh key in project - ngine_io.cloudstack.sshkeypair: + ngine_io.cloudstack.ssh_key: name: "{{ cs_resource_prefix }}-sshkey-prj" project: "{{ cs_resource_prefix }}-prj" register: sshkey @@ -30,7 +30,7 @@ - sshkey is successful - name: setup affinity group in project - ngine_io.cloudstack.affinitygroup: + ngine_io.cloudstack.affinity_group: name: "{{ cs_resource_prefix }}-ag-prj" project: "{{ cs_resource_prefix }}-prj" register: ag @@ -40,7 +40,7 @@ - ag is successful - name: setup security group in project - ngine_io.cloudstack.securitygroup: + ngine_io.cloudstack.security_group: name: "{{ cs_resource_prefix }}-sg-prj" project: "{{ cs_resource_prefix }}-prj" register: sg @@ -83,12 +83,12 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey-prj" + - 'cs_resource_prefix + "-sshkey-prj" in instance.ssh_keys' - not instance.tags - name: test create instance in project idempotence @@ -107,12 +107,12 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" - - instance.ssh_key == cs_resource_prefix + "-sshkey-prj" + - 'cs_resource_prefix + "-sshkey-prj" in instance.ssh_keys' - not instance.tags - name: test running instance in project not updated in check mode @@ -127,9 +127,9 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -144,9 +144,9 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -162,9 +162,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -179,9 +179,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Stopped" @@ -211,9 +211,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-vm-" + instance_number + - instance.display_name == cs_resource_prefix + "-vm-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Stopped" @@ -229,9 +229,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Stopped" @@ -247,9 +247,9 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Stopped" @@ -265,9 +265,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Stopped" @@ -282,9 +282,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -299,9 +299,9 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -318,9 +318,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_2 - instance.state == "Running" @@ -336,9 +336,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -354,9 +354,9 @@ assert: that: - instance is not changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - instance.state == "Running" @@ -373,9 +373,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - name: test restore instance in project @@ -390,9 +390,9 @@ assert: that: - instance is changed - - instance.name == cs_resource_prefix + "-vm-" + instance_number + - instance.name == cs_resource_prefix + "-vm-" + instance_number|string - instance.project == cs_resource_prefix + "-prj" - - instance.display_name == cs_resource_prefix + "-display-" + instance_number + - instance.display_name == cs_resource_prefix + "-display-" + instance_number|string - instance.service_offering == test_cs_instance_offering_1 - name: test destroy instance in project in check mode @@ -520,7 +520,7 @@ - instance is not changed - name: cleanup ssh key in project - ngine_io.cloudstack.sshkeypair: + ngine_io.cloudstack.ssh_key: name: "{{ cs_resource_prefix }}-sshkey-prj" project: "{{ cs_resource_prefix }}-prj" state: absent @@ -531,7 +531,7 @@ - sshkey is successful - name: cleanup affinity group in project - ngine_io.cloudstack.affinitygroup: + ngine_io.cloudstack.affinity_group: name: "{{ cs_resource_prefix }}-ag-prj" project: "{{ cs_resource_prefix }}-prj" state: absent @@ -545,7 +545,7 @@ - ag is successful - name: cleanup security group in project ...take a while unless instance in project is expunged - ngine_io.cloudstack.securitygroup: + ngine_io.cloudstack.security_group: name: "{{ cs_resource_prefix }}-sg-prj" project: "{{ cs_resource_prefix }}-prj" state: absent diff --git a/tests/integration/targets/instance/tasks/sshkeys.yml b/tests/integration/targets/instance/tasks/sshkeys.yml index 4bb8f140..1b43d91b 100644 --- a/tests/integration/targets/instance/tasks/sshkeys.yml +++ b/tests/integration/targets/instance/tasks/sshkeys.yml @@ -77,7 +77,7 @@ assert: that: - instance is changed - - instance.ssh_key is not defined + - instance.ssh_keys is not defined - name: test update instance ssh key2 ngine_io.cloudstack.instance: @@ -90,7 +90,7 @@ assert: that: - instance is changed - - instance.ssh_key == cs_resource_prefix + "-sshkey2" + - 'cs_resource_prefix + "-sshkey2" in instance.ssh_keys' - name: test update instance ssh key2 idempotence ngine_io.cloudstack.instance: @@ -103,7 +103,7 @@ assert: that: - instance is not changed - - instance.ssh_key == cs_resource_prefix + "-sshkey2" + - 'cs_resource_prefix + "-sshkey2" in instance.ssh_keys' - name: cleanup ssh key2 ngine_io.cloudstack.ssh_key: @@ -154,7 +154,7 @@ assert: that: - instance is changed - - "'{{ cs_resource_prefix }}-sshkey' in instance.ssh_keys" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - name: test update instance ssh key idempotence ngine_io.cloudstack.instance: @@ -167,7 +167,7 @@ assert: that: - instance is not changed - - "'{{ cs_resource_prefix }}-sshkey' in instance.ssh_keys" + - 'cs_resource_prefix + "-sshkey" in instance.ssh_keys' - name: cleanup expunge instance ngine_io.cloudstack.instance: