Merge pull request #12012 from resmo/for-ansible

cloudstack: fixes and consistency change

lib/ansible/module_utils/cloudstack.py

@@ -56,8 +56,8 @@ class AnsibleCloudStack(object):
             'project':      'project',
             'account':      'account',
             'domain':       'domain',
-            'displaytext':  'displaytext',
-            'displayname':  'displayname',
+            'displaytext':  'display_text',
+            'displayname':  'display_name',
             'description':  'description',
         }
 

test/integration/cloudstack.yml

@@ -4,6 +4,8 @@
   gather_facts: no
   tags:
     - cloudstack
+  vars:
+    cs_resource_prefix: "cs{{ resource_prefix | default('') }}"
   roles:
     - { role: test_cs_sshkeypair,           tags: test_cs_sshkeypair }
     - { role: test_cs_affinitygroup,        tags: test_cs_affinitygroup }

test/integration/roles/test_cs_affinitygroup/tasks/main.yml

@@ -15,7 +15,7 @@
   assert:
     that:
     - ag|failed
-    - ag.msg == "missing required arguments: name"
+    - "ag.msg == 'missing required arguments: name'"
 
 - name: test present affinity group
   cs_affinitygroup: name={{ cs_resource_prefix }}_ag

test/integration/roles/test_cs_instancegroup/tasks/main.yml

@@ -15,7 +15,7 @@
   assert:
     that:
     - ig|failed
-    - ig.msg == "missing required arguments: name"
+    - "ig.msg == 'missing required arguments: name'"
 
 - name: test present instance group
   cs_instancegroup: name={{ cs_resource_prefix }}_ig

test/integration/roles/test_cs_securitygroup/tasks/main.yml

@@ -15,7 +15,7 @@
   assert:
     that:
     - sg|failed
-    - sg.msg == "missing required arguments: name"
+    - "sg.msg == 'missing required arguments: name'"
 
 - name: test present security group
   cs_securitygroup: name={{ cs_resource_prefix }}_sg

test/integration/roles/test_cs_sshkeypair/tasks/main.yml

@@ -10,7 +10,7 @@
   assert:
     that:
     - sshkey|failed
-    - sshkey.msg == "missing required arguments: name"
+    - "sshkey.msg == 'missing required arguments: name'"
 
 - name: test ssh key creation
   cs_sshkeypair: name={{ cs_resource_prefix }}-sshkey