Refactored subnet_pool module

Change-Id: If210789edac2768178ccf323ec5be12f0c439a0f

ci/roles/subnet_pool/defaults/main.yml

@@ -1,5 +1,24 @@
-subnet_pool_name: "subnet_pool"
-address_scope_name: "address_scope"
+address_scope_name: "ansible_address_scope"
 default_prefix_length: 24
-minimum_prefix_length: 10
+expected_fields:
+  - address_scope_id
+  - created_at
+  - default_prefix_length
+  - default_quota
+  - description
+  - id
+  - ip_version
+  - is_default
+  - is_shared
+  - maximum_prefix_length
+  - minimum_prefix_length
+  - name
+  - prefixes
+  - project_id
+  - revision_number
+  - tags
+  - tenant_id
+  - updated_at
 maximum_prefix_length: 30
+minimum_prefix_length: 10
+subnet_pool_name: "ansible_subnet_pool"

ci/roles/subnet_pool/tasks/main.yaml

@@ -1,73 +0,0 @@
----
-- name: Create address_scope
-  openstack.cloud.address_scope:
-    cloud: "{{ cloud }}"
-    name: "{{ address_scope_name }}"
-    shared: False
-    ip_version: "4"
-  register: create_address_scope
-
-- name: Create subnet pool
-  openstack.cloud.subnet_pool:
-    cloud: "{{ cloud }}"
-    name: "{{ subnet_pool_name }}"
-    shared: False
-    address_scope: "{{ address_scope_name }}"
-    prefixes:
-      - 192.168.0.0/24
-  register: create_subnet_pool
-
-- name: Verify subnet pool
-  assert:
-    that:
-      - create_subnet_pool is successful
-      - create_subnet_pool is changed
-      - create_subnet_pool.subnet_pool.name == subnet_pool_name
-      - create_subnet_pool.subnet_pool.is_shared ==  False
-      - create_subnet_pool.subnet_pool.is_default == False
-      - create_subnet_pool.subnet_pool.address_scope_id == create_address_scope.address_scope.id
-      - create_subnet_pool.subnet_pool.prefixes == ['192.168.0.0/24']
-
-
-- name: Update subnet pool
-  openstack.cloud.subnet_pool:
-    cloud: "{{ cloud }}"
-    name: "{{ subnet_pool_name }}"
-    address_scope: "{{ address_scope_name }}"
-    shared: False
-    default_prefix_length: "{{ default_prefix_length }}"
-    minimum_prefix_length: "{{ minimum_prefix_length }}"
-    maximum_prefix_length: "{{ maximum_prefix_length }}"
-    description: "test"
-    prefixes:
-      - 192.168.0.0/24
-      - 192.168.1.0/24
-  register: update_subnet_pool
-
-- name: Verify updated subnet pool
-  assert:
-    that:
-      - update_subnet_pool is successful
-      - update_subnet_pool is changed
-      - update_subnet_pool.subnet_pool.name == subnet_pool_name
-      - update_subnet_pool.subnet_pool.is_shared ==  False
-      - update_subnet_pool.subnet_pool.is_default == False
-      - update_subnet_pool.subnet_pool.address_scope_id == create_address_scope.address_scope.id
-      - update_subnet_pool.subnet_pool.prefixes == ['192.168.0.0/23']
-      - update_subnet_pool.subnet_pool.description == 'test'
-      - update_subnet_pool.subnet_pool.default_prefix_length == default_prefix_length
-      - update_subnet_pool.subnet_pool.minimum_prefix_length == minimum_prefix_length
-      - update_subnet_pool.subnet_pool.maximum_prefix_length == maximum_prefix_length
-
-- name: Delete created subnet pool
-  openstack.cloud.subnet_pool:
-    cloud: "{{ cloud }}"
-    name: "{{ subnet_pool_name }}"
-    state: absent
-
-
-- name: Delete created address scope
-  openstack.cloud.address_scope:
-    cloud: "{{ cloud }}"
-    name: "{{ address_scope_name }}"
-    state: absent

ci/roles/subnet_pool/tasks/main.yml

@@ -0,0 +1,127 @@
+---
+- name: Create address_scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    shared: False
+    ip_version: "4"
+  register: address_scope
+
+- name: Create subnet pool
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    is_shared: False
+    address_scope: "{{ address_scope_name }}"
+    prefixes:
+      - 192.168.0.0/24
+  register: subnet_pool
+
+- name: Verify subnet pool
+  assert:
+    that:
+      - subnet_pool is changed
+      - subnet_pool.subnet_pool.name == subnet_pool_name
+      - subnet_pool.subnet_pool.is_shared ==  False
+      - subnet_pool.subnet_pool.is_default == False
+      - subnet_pool.subnet_pool.address_scope_id == address_scope.address_scope.id
+      - subnet_pool.subnet_pool.prefixes == ['192.168.0.0/24']
+
+- name: Assert return values of subnet_pool module
+  assert:
+    that:
+      # allow new fields to be introduced but prevent fields from being removed
+      - expected_fields|difference(subnet_pool.subnet_pool.keys())|length == 0
+
+- name: Create subnet pool again
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    is_shared: False
+    address_scope: "{{ address_scope_name }}"
+    prefixes:
+      - 192.168.0.0/24
+  register: subnet_pool
+
+- name: Verify subnet pool again
+  assert:
+    that:
+      - subnet_pool is not changed
+
+- name: Update subnet pool
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    address_scope: "{{ address_scope_name }}"
+    is_shared: False
+    default_prefix_length: "{{ default_prefix_length }}"
+    minimum_prefix_length: "{{ minimum_prefix_length }}"
+    maximum_prefix_length: "{{ maximum_prefix_length }}"
+    description: "test"
+    prefixes:
+      - 192.168.0.0/24
+      - 192.168.1.0/24
+  register: subnet_pool
+
+- name: Verify updated subnet pool
+  assert:
+    that:
+      - subnet_pool is changed
+      - subnet_pool.subnet_pool.name == subnet_pool_name
+      - subnet_pool.subnet_pool.is_shared ==  False
+      - subnet_pool.subnet_pool.is_default == False
+      - subnet_pool.subnet_pool.address_scope_id == address_scope.address_scope.id
+      - subnet_pool.subnet_pool.prefixes == ['192.168.0.0/23']
+      - subnet_pool.subnet_pool.description == 'test'
+      - subnet_pool.subnet_pool.default_prefix_length == default_prefix_length
+      - subnet_pool.subnet_pool.minimum_prefix_length == minimum_prefix_length
+      - subnet_pool.subnet_pool.maximum_prefix_length == maximum_prefix_length
+
+- name: Update subnet pool again
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    address_scope: "{{ address_scope_name }}"
+    is_shared: False
+    default_prefix_length: "{{ default_prefix_length }}"
+    minimum_prefix_length: "{{ minimum_prefix_length }}"
+    maximum_prefix_length: "{{ maximum_prefix_length }}"
+    description: "test"
+    prefixes:
+      - 192.168.0.0/23
+  register: subnet_pool
+
+- name: Verify updated subnet pool again
+  assert:
+    that:
+      - subnet_pool is not changed
+
+- name: Delete created subnet pool
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    state: absent
+  register: subnet_pool
+
+- name: Verify deleted subnet pool
+  assert:
+    that:
+      - subnet_pool is changed
+
+- name: Delete created subnet pool again
+  openstack.cloud.subnet_pool:
+    cloud: "{{ cloud }}"
+    name: "{{ subnet_pool_name }}"
+    state: absent
+  register: subnet_pool
+
+- name: Verify deleted subnet pool again
+  assert:
+    that:
+      - subnet_pool is not changed
+
+- name: Delete created address scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    state: absent