tests: update pools definitions

setting attributes with empty string is a bad user input.
Also, removing `rule_name` attribute when creating a code erasure pool.
(this rule isnt intended for code erasure pool type).

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 83faf943512f4c8010ab5d42fc2e38e169bcc4fe)

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 58756bd941c8ddafc8026e5a874d647f6af72087..6b19bcbd89f805783a0e3882ffbbc483e497f2a5 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -22,10 +22,7 @@ openstack_glance_pool:
   name: "images"
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
   type: 3
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
   pg_autoscale_mode: True
   target_size_ratio: 0.2
@@ -35,8 +32,6 @@ openstack_cinder_pool:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
 openstack_pools:
   - "{{ openstack_glance_pool }}"

diff --git a/tests/functional/all_daemons/container/group_vars/clients b/tests/functional/all_daemons/container/group_vars/clients
index a8ea366d04a907a8c0c3109907f28c7b9d438f8d..27248d7374513a908ff84700d4467b81215cd50c 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/clients
+++ b/tests/functional/all_daemons/container/group_vars/clients
@@ -7,16 +7,12 @@ test:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
 test2:
   name: "test2"
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
 pools:
   - "{{ test }}"
   - "{{ test2 }}"

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 1469ff555b7888a07a8ac9568b3f591d23f4c94c..8117ebc219b552908d0485336ec89b6f49980960 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -14,10 +14,7 @@ openstack_glance_pool:
   name: "images"
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
   type: 3
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
   application: rbd
   pg_autoscale_mode: True
@@ -28,8 +25,6 @@ openstack_cinder_pool:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
   application: rbd
 openstack_pools:

diff --git a/tests/functional/all_daemons/group_vars/clients b/tests/functional/all_daemons/group_vars/clients
index b892f802488b975d9526e4338afae0f3819db561..64ff43313650b2cd6401bc072fccdeed49d377b4 100644 (file)
--- a/tests/functional/all_daemons/group_vars/clients
+++ b/tests/functional/all_daemons/group_vars/clients
@@ -7,8 +7,6 @@ test:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: "{{ osd_pool_default_size }}"
 test2:
   name: "test2"
@@ -16,8 +14,6 @@ test2:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: "{{ osd_pool_default_size }}"
 pools:
   - "{{ test }}"