From bd5cde631bf366b4a12eb36f146aba9c257b6b75 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 21 Jul 2020 09:27:10 +0200
Subject: [PATCH] tests: refact shrink_osd scenario

This adds more coverage on the shrink_osd scenario.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 7efea219d62792c599b9d66035395323334beeaa)
---
 tests/functional/shrink_osd/container/group_vars/osds    | 9 ---------
 tests/functional/shrink_osd/container/hosts              | 7 ++++---
 .../shrink_osd/container/vagrant_variables.yml           | 2 +-
 tests/functional/shrink_osd/group_vars/osds              | 9 ---------
 tests/functional/shrink_osd/hosts                        | 7 ++++---
 tests/functional/shrink_osd/vagrant_variables.yml        | 2 +-
 6 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/tests/functional/shrink_osd/container/group_vars/osds b/tests/functional/shrink_osd/container/group_vars/osds
index c9149bd50..e441fd8c8 100644
--- a/tests/functional/shrink_osd/container/group_vars/osds
+++ b/tests/functional/shrink_osd/container/group_vars/osds
@@ -1,11 +1,2 @@
 ---
 journal_size: 100
-osd_objectstore: "filestore"
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals
diff --git a/tests/functional/shrink_osd/container/hosts b/tests/functional/shrink_osd/container/hosts
index 458c66a84..421d2875e 100644
--- a/tests/functional/shrink_osd/container/hosts
+++ b/tests/functional/shrink_osd/container/hosts
@@ -2,6 +2,7 @@
 mon0
 
 [osds]
-osd0
-osd1
-osd2
+osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]"
+osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
+osd2 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'db': 'journal1', 'db_vg': 'journals'}]"
+osd3 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group'}]" dmcrypt=true
\ No newline at end of file
diff --git a/tests/functional/shrink_osd/container/vagrant_variables.yml b/tests/functional/shrink_osd/container/vagrant_variables.yml
index f9575a7c7..1214e00a2 100644
--- a/tests/functional/shrink_osd/container/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/container/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: True
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 3
+osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
diff --git a/tests/functional/shrink_osd/group_vars/osds b/tests/functional/shrink_osd/group_vars/osds
index 59fd2abf8..bae7ce267 100644
--- a/tests/functional/shrink_osd/group_vars/osds
+++ b/tests/functional/shrink_osd/group_vars/osds
@@ -2,12 +2,3 @@
 os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 journal_size: 100
-osd_objectstore: "filestore"
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals
diff --git a/tests/functional/shrink_osd/hosts b/tests/functional/shrink_osd/hosts
index 997e8108d..3ec73c825 100644
--- a/tests/functional/shrink_osd/hosts
+++ b/tests/functional/shrink_osd/hosts
@@ -2,6 +2,7 @@
 mon0 monitor_address=192.168.71.10
 
 [osds]
-osd0
-osd1
-osd2
+osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]"
+osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
+osd2 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'db': 'journal1', 'db_vg': 'journals'}]"
+osd3 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group'}]" dmcrypt=true
diff --git a/tests/functional/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml
index 208a28f98..eb5e9350b 100644
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 3
+osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0