add inventory tests

Author: resmo

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

@@ -9,7 +9,7 @@
   cs_template:
     name: "{{ cs_common_template }}"
     state: absent
-    cross_zones: yes
+    cross_zones: true
     template_filter: all
   register: template
   check_mode: true
@@ -22,7 +22,7 @@
     name: smoke-test-vm
     template: "{{ cs_common_template }}"
     service_offering: "{{ cs_common_service_offering }}"
-    zone: "{{ cs_common_zone_adv }}"
+    zone: "{{ cs_common_zone_basic }}"
   register: instance
   until: instance is successful
   retries: 20

tests/integration/targets/inventory_instance/aliases

@@ -1,2 +1,3 @@
 cloud/cs
-shippable/cs/group2
+cs/group1
+cs/group3

tests/integration/targets/inventory_instance/cloudstack-instances.yml

@@ -1 +1 @@
-plugin: ngine_io.cloudstack.cloudstack
+plugin: ngine_io.cloudstack.instance

tests/integration/targets/inventory_instance/playbooks/basic-configuration.yml

@@ -1,15 +1,18 @@
 ---
-- hosts: 127.0.0.1
+- hosts: localhost
   connection: local
-  gather_facts: no
+  gather_facts: false
   vars:
-    simulator: http://cloudstack-sim:8888
+    simulator: http://172.17.0.2:8888
   tasks:
     - name: Retrieve Simulator Keys
       uri:
-        url: "{{simulator}}/admin.json"
-        return_content: yes
+        url: "{{ simulator }}/admin.json"
+        return_content: true
       register: admin
+      until: admin is success
+      retries: 5
+      delay: 1
 
     - name: Create cloudstack.env
       template:
@@ -19,4 +22,4 @@
     - name: Create cloudstack-instances.yml
       template:
         src: templates/cloudstack-instances.yml.j2
-        dest: ../cloudstack-instances.yml
+        dest: ../cloudstack-instances.yml

tests/integration/targets/inventory_instance/playbooks/common-cloudstack-objects.yml

@@ -1,17 +1,16 @@
 ---
-- hosts: 127.0.0.1
+- hosts: localhost
   connection: local
-  gather_facts: no
+  gather_facts: false
   tasks:
-
     - include_vars:
         file: vars/common.yml
 
     - name: wait for system template available
       cs_template:
         name: "{{ cs_common_template }}"
         state: absent
-        cross_zones: yes
+        cross_zones: true
         template_filter: all
       register: template
       check_mode: true
@@ -24,7 +23,7 @@
         name: smoke-test-vm
         template: "{{ cs_common_template }}"
         service_offering: "{{ cs_common_service_offering }}"
-        zone: "{{ cs_common_zone_adv }}"
+        zone: "{{ cs_common_zone_basic }}"
       register: instance
       until: instance is successful
       retries: 2

tests/integration/targets/inventory_instance/playbooks/instance-inventory-test.yml

@@ -1,3 +1,2 @@
 ---
-
-- import_playbook: common-cloudstack-objects.yml
+- import_playbook: common-cloudstack-objects.yml

tests/integration/targets/inventory_instance/playbooks/templates/cloudstack.env.j2

@@ -1,11 +1,11 @@
-CLOUDSTACK_ENDPOINT="{{simulator}}/client/api"
+CLOUDSTACK_ENDPOINT="{{ simulator }}/client/api"
 export CLOUDSTACK_ENDPOINT
 
-CLOUDSTACK_KEY="{{admin.json.apikey}}"
+CLOUDSTACK_KEY="{{ admin.json.apikey }}"
 export CLOUDSTACK_KEY
 
 CLOUDSTACK_SECRET="{{admin.json.secretkey}}"
 export CLOUDSTACK_SECRET
 
 CLOUDSTACK_TIMEOUT=60
-export CLOUDSTACK_TIMEOUT
+export CLOUDSTACK_TIMEOUT

tests/integration/targets/inventory_instance/playbooks/vars/common.yml

@@ -1,9 +1,7 @@
 ---
-
 # TODO: This is borrowed from common role, should be better reused
 
 cs_resource_prefix: "cs-{{ (ansible_date_time.iso8601_micro | to_uuid).split('-')[0] }}"
 cs_common_template: CentOS 5.6 (64-bit) no GUI (Simulator)
 cs_common_service_offering: Small Instance
-cs_common_zone_adv: Sandbox-simulator-advanced
-cs_common_zone_basic: Sandbox-simulator-basic
+cs_common_zone_basic: Sandbox-simulator-basic