Refactored catalog_service{,_info} and auth modules

Replaced service_catalog return value in auth module with new
catalog_service_info module.

Change-Id: I1ca5082d643eb97e8cb951a4bccf92b78537d917

ci/roles/auth/defaults/main.yml

@@ -0,0 +1,2 @@
+expected_fields:
+  - auth_token

ci/roles/auth/tasks/main.yml

@@ -2,5 +2,10 @@
 - name: Authenticate to the cloud
   openstack.cloud.auth:
     cloud={{ cloud }}
+  register: auth
 
-- debug: var=service_catalog
+- name: Assert return values of auth module
+  assert:
+    that:
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(auth.keys())|length == 0

ci/roles/catalog_service/defaults/main.yml

@@ -0,0 +1,7 @@
+expected_fields:
+  - description
+  - id
+  - is_enabled
+  - links
+  - name
+  - type

ci/roles/catalog_service/tasks/main.yml

@@ -23,15 +23,8 @@
 
 - name: Verify returned values
   assert:
-    that:
-      - item in service_test.service
-  loop:
-    - description
-    - id
-    - is_enabled
-    - links
-    - name
-    - type
+    that: item in service_test.service
+  loop: "{{ expected_fields }}"
 
 - name: Check if the service test was created successfully
   openstack.cloud.catalog_service:
@@ -42,15 +35,8 @@
 
 - name: Verify returned values
   assert:
-    that:
-      - item in service_created.service
-  loop:
-    - description
-    - id
-    - is_enabled
-    - links
-    - name
-    - type
+    that: item in service_created.service
+  loop: "{{ expected_fields }}"
 
 - name: Update service test
   openstack.cloud.catalog_service:
@@ -61,12 +47,35 @@
     name: test
   register: service_test
 
-- name: Check if description and enabled were updated
+- name: Check if description and is_enabled were updated
   assert:
     that:
       - service_test.service.description == "A new description"
       - not (service_test.service.is_enabled|bool)
 
+- name: Get all services
+  openstack.cloud.catalog_service_info:
+    cloud: "{{ cloud }}"
+  register: services
+
+- name: Assert return values of catalog_service_info module
+  assert:
+    that:
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(services.services[0].keys())|length == 0
+
+- name: Get service by name
+  openstack.cloud.catalog_service_info:
+    cloud: "{{ cloud }}"
+    name: test
+  register: services
+
+- name: Assert services returned by catalog_service_info module
+  assert:
+    that:
+      - services.services|length == 1
+      - services.services[0].id == service_test.service.id
+
 - name: Delete service test
   openstack.cloud.catalog_service:
     cloud: "{{ cloud }}"