Refactored compute_service_info module

Change-Id: I1773b72f8c7eaec77f0480045c45073dc522c5cf

ci/roles/compute_service/defaults/main.yml

@@ -0,0 +1,11 @@
+expected_fields:
+  - availability_zone
+  - binary
+  - disabled_reason
+  - host
+  - id
+  - is_forced_down
+  - name
+  - state
+  - status
+  - updated_at

ci/roles/compute_service/tasks/main.yml

@@ -0,0 +1,23 @@
+---
+- name: Fetch compute services
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+  register: compute_services
+
+- name: Assert return values of compute_service_info module
+  assert:
+    that:
+      - compute_services.compute_services | length > 0
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(compute_services.compute_services[0].keys())|length == 0
+
+- name: Fetch compute services with filters
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+    binary: "nova-compute"
+  register: compute_services
+
+- name: Assert return values of compute_service_info module
+  assert:
+    that:
+      - compute_services.compute_services | length > 0

ci/roles/nova_services/tasks/main.yml

@@ -1,33 +0,0 @@
----
-
-- name: Get nova compute services info
-  openstack.cloud.compute_service_info:
-    cloud: "{{ cloud }}"
-  register: result
-  failed_when: "result.openstack_compute_services | length <= 0"
-
-- name: Assert fields on OpenStack SDK before 0.53
-  when: sdk_version is version(0.53, '<')
-  assert:
-    that:
-    - '["availability_zone", "binary", "disables_reason",
-        "host", "name", "state", "status", "id"] |
-        difference(result.openstack_compute_services.0.keys()) | length == 0'
-
-- name: Assert fields on OpenStack SDK 0.53 and later
-  when: sdk_version is version(0.53, '>=')
-  assert:
-    that:
-    - '["availability_zone", "binary", "disabled_reason", "is_forced_down",
-        "host", "name", "state", "status", "updated_at", "id"] |
-        difference(result.openstack_compute_services.0.keys()) | length == 0'
-
-- name: Filter compute services. Supported since OpenStack SDK 0.53.0 (Wallaby).
-  when: sdk_version is version(0.53, '>=')
-  block:
-  - name: Get nova compute services info
-    openstack.cloud.compute_service_info:
-      cloud: "{{ cloud }}"
-      binary: "nova-compute"
-    register: result
-    failed_when: "result.openstack_compute_services | length <= 0"

ci/run-collection.yml

@@ -11,6 +11,7 @@
     - { role: coe_cluster_template, tags: coe_cluster_template }
     - { role: compute_flavor, tags: compute_flavor }
     - { role: compute_flavor_access, tags: compute_flavor_access }
+    - { role: compute_service, tags: compute_service }
     - { role: config, tags: config }
     - { role: dns_zone, tags: dns_zone }
     - { role: endpoint, tags: endpoint }
@@ -37,9 +38,6 @@
     - { role: logging, tags: logging }
     - { role: network, tags: network }
     - { role: neutron_rbac_policy, tags: neutron_rbac_policy }
-    - role: nova_services
-      tags: nova_services
-      when: sdk_version is version(0.44, '>=')
     - { role: object, tags: object }
     - { role: object_container, tags: object_container }
     - { role: port, tags: port }