Refactored identity_role{,_info} modules

Change-Id: If8230eb8b41b5461e1eaa470569030e8a888015b

ci/roles/identity_role/defaults/main.yml

@@ -1,4 +1,3 @@
-role_name: ansible_keystone_role
 expected_fields:
   - description
   - domain_id

ci/roles/identity_role/tasks/main.yml

@@ -1,83 +1,88 @@
 ---
-- name: Cleanup before tests
-  block:
-    - openstack.cloud.identity_role:
-        cloud: "{{ cloud }}"
-        state: absent
-        name: "{{ role_name }}"
+- name: Create identity role
+  openstack.cloud.identity_role:
+    cloud: "{{ cloud }}"
+    state: present
+    name: ansible_role
+    description: "ansible role"
+  register: role
 
-- block:
-  - name: Delete unexistent role
-    openstack.cloud.identity_role:
-      cloud: "{{ cloud }}"
-      state: absent
-      name: "{{ role_name }}"
-    register: role
-  - name: Assert role didn't change
-    assert:
-      that: role is not changed
+- name: Assert return values of identity_role module
+  assert:
+    that:
+      - role.role.name == 'ansible_role'
+      - role.role.description == "ansible role"
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(role.role.keys())|length == 0
 
-- block:
-  - name: Create keystone role
-    openstack.cloud.identity_role:
-      cloud: "{{ cloud }}"
-      state: present
-      name: "{{ role_name }}"
-    register: role
-  - name: Try to get role
-    openstack.cloud.identity_role_info:
-       cloud: "{{ cloud }}"
-       name: "{{ role_name }}"
-    register: roles
-  - name: Assert role found
-    assert:
-      that:
-        - roles.roles | length == 1
-  - name: Assert role changed
-    assert:
-      that: role is changed
-  - name: Assert return fields
-    assert:
-      that: item in role['role']
-    loop: "{{ expected_fields }}"
-  - name: Assert return value
-    assert:
-      that: role['role']['name'] == role_name
-  - name: Assert retrieved values
-    assert:
-      that: roles.roles[0].name == role_name
+- name: Try to get role
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+     name: ansible_role
+  register: roles
 
-- block:
-  - name: Create existing keystone role
-    openstack.cloud.identity_role:
-      cloud: "{{ cloud }}"
-      state: present
-      name: "{{ role_name }}"
-    register: role
-  - name: Assert role not changed
-    assert:
-      that: role is not changed
-  - name: Assert return fields
-    assert:
-      that: item in role['role']
-    loop: "{{ expected_fields }}"
+- name: Assert role found
+  assert:
+    that:
+      - roles.roles | length == 1
+      - roles.roles.0.name == 'ansible_role'
 
-- block:
-  - name: Delete keystone role
-    openstack.cloud.identity_role:
-      cloud: "{{ cloud }}"
-      state: absent
-      name: "{{ role_name }}"
-    register: role
-  - name: Assert role changed
-    assert:
-      that: role is changed
-  - name: Try to get role
-    openstack.cloud.identity_role_info:
-       cloud: "{{ cloud }}"
-       name: "{{ role_name }}"
-    register: roles
-  - name: Assert no role found
-    assert:
-      that:
-        - roles.roles | length == 0
+- name: Fetch all roles
+  openstack.cloud.identity_role_info:
+    cloud: "{{ cloud }}"
+  register: roles
+
+- name: Assert return values of identity_role_info module
+  assert:
+    that:
+      - roles.roles | length > 0
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(roles.roles.0.keys())|length == 0
+
+- name: Create identity role again
+  openstack.cloud.identity_role:
+    cloud: "{{ cloud }}"
+    state: present
+    name: ansible_role
+    description: "ansible role"
+  register: role
+
+- name: Assert role did not change
+  assert:
+    that:
+      - role is not changed
+
+- name: Delete identity role
+  openstack.cloud.identity_role:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: ansible_role
+  register: role
+
+- name: Assert role changed
+  assert:
+    that:
+      - role is changed
+
+- name: Try to get role
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+     name: ansible_role
+  register: roles
+
+- name: Assert no role found
+  assert:
+    that:
+      - roles.roles | length == 0
+
+- name: Delete role again
+  openstack.cloud.identity_role:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: ansible_role
+  register: role
+
+- name: Assert role did not change
+  assert:
+    that:
+      - role is not changed

ci/roles/identity_role_info/tasks/main.yml

@@ -1,64 +0,0 @@
-- name: Ensure role does not exist before tests
-  openstack.cloud.identity_role:
-    cloud: "{{ cloud }}"
-    state: absent
-    name: test_role
-
-- name: Get unexistent role
-  openstack.cloud.identity_role_info:
-    cloud: "{{ cloud }}"
-    name: test_role
-  register: roleinfo
-
-- debug:
-    var: roleinfo
-
-- name: Assert that no results were returned
-  assert:
-    that: not roleinfo.roles
-
-- name: Create keystone role
-  openstack.cloud.identity_role:
-    cloud: "{{ cloud }}"
-    state: present
-    name: test_role
-
-- name: Create second role
-  openstack.cloud.identity_role:
-    cloud: "{{ cloud }}"
-    state: present
-    name: test_role2
-
-- name: Get role by name
-  openstack.cloud.identity_role_info:
-    cloud: "{{ cloud }}"
-    name: test_role
-  register: roleinfo
-
-- debug:
-    var: roleinfo
-
-- name: Assert that only one result was returned
-  assert:
-    that: roleinfo.roles | length == 1
-
-- name: Assert that roleinfo has fields
-  assert:
-    that: item in roleinfo.roles[0]
-  loop:
-    - description
-    - domain_id
-    - id
-    - links
-    - name
-
-- name: Post-test cleanup
-  block:
-  - name: Clean up roles
-    openstack.cloud.identity_role:
-      cloud: "{{ cloud }}"
-      state: absent
-      name: "{{ item }}"
-    loop:
-      - test_role
-      - test_role2

ci/run-collection.yml

@@ -23,7 +23,6 @@
     - { role: identity_user, tags: identity_user }
     - { role: identity_user_info, tags: identity_user_info }
     - { role: identity_role, tags: identity_role }
-    - { role: identity_role_info, tags: identity_role_info }
     - { role: image, tags: image }
     - { role: keypair, tags: keypair }
     - role: keystone_idp