cs_service_offering: response tag was replaced with storagetag in 4.16

Author: resmo

.github/workflows/integration.yml

@@ -29,6 +29,7 @@ jobs:
         ansible-branch:
           - stable-2.17
         container-version:
+          - 1.6.1
           - 1.4.0
     steps:
       - name: Check out code

plugins/modules/cs_instance.py

@@ -341,6 +341,12 @@
   returned: if available
   type: str
   sample: key@work
+ssh_keys:
+  description: Names of SSH key deployed to instance.
+  returned: if available
+  type: list
+  sample: [key@work, key@home]
+  version_added: 2.5.0
 domain:
   description: Domain the instance is related to.
   returned: success
@@ -463,6 +469,7 @@ def __init__(self, module):
             'templatename': 'template',
             'templatedisplaytext': 'template_display_text',
             'keypair': 'ssh_key',
+            'keypairs': 'ssh_keys',
             'hostname': 'host',
         }
         self.instance = None

plugins/modules/cs_service_offering.py

@@ -509,9 +509,14 @@ def get_result(self, resource):
             if 'hosttags' in resource:
                 self.result['host_tags'] = resource['hosttags'].split(',') or [resource['hosttags']]
 
-            # Prevent confusion, the api returns a tags key for storage tags.
-            if 'tags' in resource:
+            if 'storagetags' in resource:
+                self.result['storage_tags'] = resource['storagetags'].split(',') or [resource['storagetags']]
+
+            # Prevent confusion, the api returns a "tags" key for storage tags.
+            # Version < 4.16
+            elif 'tags' in resource:
                 self.result['storage_tags'] = resource['tags'].split(',') or [resource['tags']]
+
             if 'tags' in self.result:
                 del self.result['tags']
 

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

@@ -11,8 +11,8 @@
 - name: verify update instance ssh key non existent
   assert:
     that:
-    - instance is failed
-    - 'instance.msg == "SSH key not found: {{ cs_resource_prefix }}-sshkey-does-not-exist"'
+      - instance is failed
+      - 'instance.msg == "SSH key not found: {{ cs_resource_prefix }}-sshkey-does-not-exist"'
 
 - name: test create instance without keypair in check mode
   cs_instance:
@@ -25,8 +25,8 @@
 - name: verify create instance without keypair in check mode
   assert:
     that:
-    - instance is successful
-    - instance is changed
+      - instance is successful
+      - instance is changed
 
 - name: test create instance without keypair
   cs_instance:
@@ -38,9 +38,9 @@
 - name: verify create instance without keypair
   assert:
     that:
-    - instance is successful
-    - instance is changed
-    - instance.ssh_key is not defined
+      - instance is successful
+      - instance is changed
+      - instance.ssh_keys is not defined
 
 - name: test create instance without keypair idempotence
   cs_instance:
@@ -52,9 +52,9 @@
 - name: verify create instance without keypair idempotence
   assert:
     that:
-    - instance is successful
-    - instance is not changed
-    - instance.ssh_key is not defined
+      - instance is successful
+      - instance is not changed
+      - instance.ssh_keys is not defined
 
 - name: setup ssh key2
   cs_sshkeypair:
@@ -63,7 +63,7 @@
 - name: verify setup ssh key2
   assert:
     that:
-    - sshkey is successful
+      - sshkey is successful
 
 - name: test update instance ssh key2 in check mode
   cs_instance:
@@ -76,8 +76,8 @@
 - name: verify update instance ssh key2 in check mode
   assert:
     that:
-    - instance is changed
-    - instance.ssh_key is not defined
+      - instance is changed
+      - instance.ssh_key is not defined
 
 - name: test update instance ssh key2
   cs_instance:
@@ -89,8 +89,8 @@
 - name: verify update instance ssh key2
   assert:
     that:
-    - instance is changed
-    - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey2"
+      - instance is changed
+      - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey2"
 
 - name: test update instance ssh key2 idempotence
   cs_instance:
@@ -102,8 +102,8 @@
 - name: verify update instance ssh key2 idempotence
   assert:
     that:
-    - instance is not changed
-    - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey2"
+      - instance is not changed
+      - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey2"
 
 - name: cleanup ssh key2
   cs_sshkeypair:
@@ -113,7 +113,7 @@
 - name: verify cleanup ssh key2
   assert:
     that:
-    - sshkey2 is successful
+      - sshkey2 is successful
 
 - name: test update instance ssh key2 idempotence2
   cs_instance:
@@ -126,8 +126,8 @@
 - name: verify update instance ssh key2 idempotence2
   assert:
     that:
-    - instance is failed
-    - 'instance.msg == "SSH key not found: {{ cs_resource_prefix }}-sshkey2"'
+      - instance is failed
+      - 'instance.msg == "SSH key not found: {{ cs_resource_prefix }}-sshkey2"'
 
 - name: test update instance ssh key in check mode
   cs_instance:
@@ -140,8 +140,8 @@
 - name: verify update instance ssh key in check mode
   assert:
     that:
-    - instance is changed
-    - instance.ssh_key is not defined
+      - instance is changed
+      - instance.ssh_keys is not defined
 
 - name: test update instance ssh key
   cs_instance:
@@ -153,8 +153,8 @@
 - name: verify update instance ssh key
   assert:
     that:
-    - instance is changed
-    - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey"
+      - instance is changed
+      - "'{{ cs_resource_prefix }}-sshkey' in instance.ssh_keys"
 
 - name: test update instance ssh key idempotence
   cs_instance:
@@ -166,8 +166,8 @@
 - name: verify update instance ssh key idempotence
   assert:
     that:
-    - instance is not changed
-    - instance.ssh_key == "{{ cs_resource_prefix }}-sshkey"
+      - instance is not changed
+      - "'{{ cs_resource_prefix }}-sshkey' in instance.ssh_keys"
 
 - name: cleanup expunge instance
   cs_instance:
@@ -178,4 +178,4 @@
 - name: verify cleanup expunge instance
   assert:
     that:
-    - instance is successful
+      - instance is successful

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

@@ -1,7 +1,7 @@
 ---
 - name: setup zone is absent
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     state: absent
   register: zone
 - name: verify setup zone absent
@@ -11,7 +11,7 @@
 
 - name: test fail missing param
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
   register: zone
   ignore_errors: true
 - name: verify test fail missing param
@@ -22,7 +22,7 @@
 
 - name: test create zone in check mode
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     network_type: Basic
@@ -36,7 +36,7 @@
 
 - name: test create zone
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     network_type: Basic
@@ -58,7 +58,7 @@
 
 - name: test create zone idempotency
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     network_type: Basic
@@ -80,7 +80,7 @@
 
 - name: test update zone in check mode
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     internal_dns1: 10.10.1.100
@@ -106,7 +106,7 @@
 
 - name: test update zone
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     internal_dns1: 10.10.1.100
@@ -131,7 +131,7 @@
 
 - name: test update zone idempotency
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     dns1: 8.8.8.8
     dns2: 8.8.4.4
     internal_dns1: 10.10.1.100
@@ -156,7 +156,7 @@
 
 - name: test absent zone in check mode
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     state: absent
   register: zone
   check_mode: true
@@ -176,7 +176,7 @@
 
 - name: test absent zone
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     state: absent
   register: zone
 - name: verify test absent zone
@@ -195,7 +195,7 @@
 
 - name: test absent zone idempotency
   cs_zone:
-    name: "{{ cs_resource_prefix }}-zone"
+    name: "{{ cs_resource_prefix }}-zone1"
     state: absent
   register: zone
 - name: verify test absent zone idempotency