Refactored identity_domain{,_info} modules

Change-Id: Idf48f10e66a5651fa4693774eecd2c8683703082

ci/roles/identity_domain/defaults/main.yml

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

ci/roles/identity_domain/tasks/main.yml

@@ -0,0 +1,123 @@
+---
+- name: Create keystone domain
+  openstack.cloud.identity_domain:
+    cloud: "{{ cloud }}"
+    state: present
+    name: ansible_domain
+    description: "test description"
+  register: domain
+
+- name: Assert return values of identity_domain module
+  assert:
+    that:
+      - domain.domain.name == 'ansible_domain'
+      - domain.domain.description == "test description"
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(domain.domain.keys())|length == 0
+
+- name: Update keystone domain
+  openstack.cloud.identity_domain:
+    cloud: "{{ cloud }}"
+    name: ansible_domain
+    description: "updated description"
+  register: domain
+
+- name: Assert updated domain
+  assert:
+    that:
+      - domain.domain.description == "updated description"
+
+- name: Fetch domains
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+  register: domains
+
+- name: Assert return values of identity_domain_info module
+  assert:
+    that:
+      - domains.domains | length > 0
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(domains.domains.0.keys())|length == 0
+
+- name: Fetch domain by name
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+    name: ansible_domain
+  register: domains
+
+- name: Assert named domain
+  assert:
+    that:
+      - domains.domains | length == 1
+
+- name: Create disabled domain
+  openstack.cloud.identity_domain:
+    cloud: "{{ cloud }}"
+    state: present
+    name: ansible_domain_disabled
+    is_enabled: false
+    description: "test description"
+  register: domain
+
+- name: Fetch all domains
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+  register: domains
+
+- name: Assert both ansible domains exist
+  assert:
+    that:
+      - domains.domains | length >= 2
+
+- name: Fetch disabled domains
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+    filters:
+      is_enabled: false
+  register: domains
+
+- name: Assert at least one disabled domain exists
+  assert:
+    that:
+      - domains.domains | length >= 1
+
+- name: Fetch enabled domains
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+    filters:
+      is_enabled: true
+  register: domains
+
+- name: Assert returned value
+  assert:
+    that:
+      - item.is_enabled
+  loop: "{{ domains.domains }}"
+
+- name: Delete disabled domain
+  openstack.cloud.identity_domain:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: ansible_domain_disabled
+
+- name: Assert domain is disabled
+  assert:
+    that:
+      - not domain.domain.is_enabled
+
+- name: Delete domain
+  openstack.cloud.identity_domain:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: ansible_domain
+
+- name: Get non-existing domain
+  openstack.cloud.identity_domain_info:
+    cloud: "{{ cloud }}"
+    name: ansible_domain
+  register: domains
+
+- name: Assert no results returned
+  assert:
+    that:
+      - domains.domains | length == 0

ci/roles/identity_domain_info/defaults/main.yml

@@ -1,9 +0,0 @@
-domain_name: domain_info_test_domain
-unexistent_domain_name: domain_info_unexistent_domain
-disabled_domain_name: test_domain_disabled
-domain_info_fields:
-  - description
-  - id
-  - is_enabled
-  - name
-  - links

ci/roles/identity_domain_info/tasks/main.yml

@@ -1,72 +0,0 @@
----
-- block:
-  - name: Ensure domain does not exist
-    openstack.cloud.identity_domain:
-      cloud: "{{ cloud }}"
-      state: absent
-      name: "{{ unexistent_domain_name }}"
-  - name: Get unexistent domain
-    openstack.cloud.identity_domain_info:
-      cloud: "{{ cloud }}"
-      name: "{{ unexistent_domain_name }}"
-    register: domain_info
-  - name: Assert no results returned
-    assert:
-      that: not domain_info.openstack_domains
-
-
-- block:
-  - name: Ensure domain exists
-    openstack.cloud.identity_domain:
-      cloud: "{{ cloud }}"
-      state: present
-      name: "{{ domain_name }}"
-      description: "test description"
-    register: domain
-  - name: Get domain
-    openstack.cloud.identity_domain_info:
-      cloud: "{{ cloud }}"
-      name: "{{ domain_name }}"
-    register: domain_info
-  - name: Assert one result exists
-    assert:
-      that: domain_info.openstack_domains | length == 1
-  - name: Assert fields are present
-    assert:
-      that: item in domain_info.openstack_domains[0]
-    loop: "{{ domain_info_fields }}"
-  - name: Assert returned value
-    assert:
-      that:
-        - domain_info.openstack_domains[0].description == domain.domain.description
-
-- block:
-  - name: Get all domains
-    openstack.cloud.identity_domain_info:
-      cloud: "{{ cloud }}"
-    register: domain_info
-
-- block:
-  - name: Ensure disabled domain exists
-    openstack.cloud.identity_domain:
-      cloud: "{{ cloud }}"
-      state: present
-      name: "{{ disabled_domain_name }}"
-      enabled: false
-      description: "test description"
-    register: domain
-  - name: Get filtered domains
-    openstack.cloud.identity_domain_info:
-      cloud: "{{ cloud }}"
-      filters:
-        enabled: true
-    register: domain_info
-  - name: Assert at least one result
-    assert:
-      that: domain_info.openstack_domains | length >= 1
-  - name: Assert returned value
-    assert:
-      that: item.is_enabled == true
-    loop: "{{ domain_info.openstack_domains }}"
-
-

ci/roles/identity_group/tasks/main.yml

@@ -52,21 +52,21 @@
      cloud: "{{ cloud }}"
      state: present
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
   register: group_result
 
 - name: Assert results
   assert:
     that:
       - group_result is changed
-      - group_result.group.domain_id == domain.id
+      - group_result.group.domain_id == domain.domain.id
 
 - name: Create group in specific domain again
   openstack.cloud.identity_group:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
   register: group_result
 
 - name: Assert not changed
@@ -90,7 +90,7 @@
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
   register: group_result
 
 - name: Assert changed
@@ -102,7 +102,7 @@
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
   register: group_result
 
 - name: Assert not changed

ci/roles/keystone_domain/defaults/main.yml

@@ -1 +0,0 @@
-domain_name: ansible_domain

ci/roles/keystone_domain/tasks/main.yml

@@ -1,36 +0,0 @@
----
-- name: Create keystone domain
-  openstack.cloud.identity_domain:
-    cloud: "{{ cloud }}"
-    state: present
-    name: "{{ domain_name }}"
-    description: "test description"
-  register: os_domain
-
-- name: Test output
-  assert:
-    that:
-      - "'domain' in os_domain"
-      - os_domain.domain.name == domain_name
-      - >-
-          ('enabled' in os_domain.domain.keys() and os_domain.domain['enabled']|bool) or
-          ('is_enabled' in os_domain.domain and os_domain.domain['is_enabled']|bool)
-      - os_domain.domain.description == "test description"
-
-- name: Update keystone domain
-  openstack.cloud.identity_domain:
-    cloud: "{{ cloud }}"
-    name: "{{ domain_name }}"
-    description: "updated description"
-  register: os_domain_updated
-
-- name: Test output
-  assert:
-    that:
-      - os_domain_updated.domain.description == "updated description"
-
-- name: Delete keystone domain
-  openstack.cloud.identity_domain:
-    cloud: "{{ cloud }}"
-    state: absent
-    name: "{{ domain_name }}"

ci/roles/keystone_federation_protocol/tasks/main.yml

@@ -33,7 +33,7 @@
       openstack.cloud.federation_idp:
         state: 'present'
         name: '{{ idp_name }}'
-        domain_id: '{{ create_domain.id }}'
+        domain_id: '{{ create_domain.domain.id }}'
 
     - name: 'Create test mapping (1)'
       openstack.cloud.federation_mapping:

ci/roles/keystone_idp/tasks/main.yml

@@ -22,13 +22,9 @@
       openstack.cloud.identity_domain:
         name: '{{ domain_name }}'
       register: create_domain
-    - assert:
-        that:
-        - create_domain is successful
-        - '"id" in create_domain'
     - name: 'Store domain ID as fact'
       set_fact:
-        domain_id: '{{ create_domain.id }}'
+        domain_id: '{{ create_domain.domain.id }}'
 
     # We *should* have a blank slate to start with, but we also shouldn't
     # explode if I(state=absent) and the IDP doesn't exist

ci/roles/user_role/tasks/main.yaml

@@ -17,7 +17,7 @@
      cloud: "{{ cloud }}"
      state: present
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
 
 - name: Create user in default domain
   openstack.cloud.identity_user:
@@ -31,7 +31,7 @@
      cloud: "{{ cloud }}"
      state: present
      name: "{{ user_name }}"
-     domain: "{{ domain.id }}"
+     domain: "{{ domain.domain.id }}"
 
 - name: Assign role to group in default domain
   openstack.cloud.role_assignment:
@@ -45,7 +45,7 @@
     cloud: "{{ cloud }}"
     role: "{{ keystone_role_name }}"
     group: "{{ group_name }}"
-    domain: "{{ domain.id }}"
+    domain: "{{ domain.domain.id }}"
 
 - name: Assign role to user in default domain
   openstack.cloud.role_assignment:
@@ -59,7 +59,7 @@
     cloud: "{{ cloud }}"
     role: "{{ keystone_role_name }}"
     user: "{{ user_name }}"
-    domain: "{{ domain.id }}"
+    domain: "{{ domain.domain.id }}"
 
 - name: Delete group in default domain
   openstack.cloud.identity_group:
@@ -73,7 +73,7 @@
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ group_name }}"
-     domain_id: "{{ domain.id }}"
+     domain_id: "{{ domain.domain.id }}"
 
 - name: Delete user in default domain
   openstack.cloud.identity_user:
@@ -87,7 +87,7 @@
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ user_name }}"
-     domain: "{{ domain.id }}"
+     domain: "{{ domain.domain.id }}"
 
 - name: Delete domain
   openstack.cloud.identity_domain:

ci/run-collection.yml

@@ -18,7 +18,7 @@
     - { role: federation_mapping, tags: federation_mapping }
     - { role: floating_ip, tags: floating_ip }
     - { role: host_aggregate, tags: host_aggregate }
-    - { role: identity_domain_info, tags: identity_domain_info }
+    - { role: identity_domain, tags: identity_domain }
     - { role: identity_group, tags: identity_group }
     - { role: identity_group_info, tags: identity_group_info }
     - { role: identity_user, tags: identity_user }
@@ -27,7 +27,6 @@
     - { role: identity_role_info, tags: identity_role_info }
     - { role: image, tags: image }
     - { role: keypair, tags: keypair }
-    - { role: keystone_domain, tags: keystone_domain }
     - role: keystone_idp
       tags: keystone_idp
       when: sdk_version is version(0.44, '>=')