test: add test for device with 'by-path'

We now test devices to be passed like:
/dev/disk/by-path/pci-0000:00:01.1-ata-1.0

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/tests/conftest.py b/tests/conftest.py
index 2030b1346686cdfaebbd9e6c1768857cba7ed68d..5a4b5b51beed37a418ebdbbde3434e71f931e9e3 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -71,7 +71,11 @@ def node(host, request):
             osd_ids = cmd.stdout.rstrip("\n").split("\n")
             osds = osd_ids
             if docker:
-                osds = [device.split("/")[-1] for device in ansible_vars.get("devices", [])]
+                osds = []
+                for device in ansible_vars.get("devices", []):
+                    real_dev = host.run("sudo readlink -f %s" % device)
+                    real_dev_split = real_dev.stdout.split("/")[-1]
+                    osds.append(real_dev_split)
 
     data = dict(
         address=address,

diff --git a/tests/functional/centos/7/bluestore/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all
index f500d0bbe67b1e0014ff6aca73f57bc1c28de23e..d053bd696d914b3a3127de115ed6074ae3fe7f98 100644 (file)
--- a/tests/functional/centos/7/bluestore/group_vars/all
+++ b/tests/functional/centos/7/bluestore/group_vars/all
@@ -10,7 +10,7 @@ cluster_network: "192.168.2.0/24"
 journal_size: 100
 osd_objectstore: "bluestore"
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'

diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all
index 0b1b2dad43acf502f286c3ac518c2f75aa18047e..59054a4ab72847222035029ad4be0266feb4d03b 100644 (file)
--- a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all
+++ b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all
@@ -11,7 +11,7 @@ osd_scenario: non-collocated
 dmcrypt: true
 osd_objectstore: "bluestore"
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'

diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all
index 247228ea6996d623843ad2d6577eed156a68b592..b0a5376b7d8bb4513c5a50ccedbebe0f573abb11 100644 (file)
--- a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all
+++ b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all
@@ -11,7 +11,7 @@ osd_scenario: collocated
 dmcrypt: true
 osd_objectstore: bluestore
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 os_tuning_params:
   - { name: kernel.pid_max, value: 4194303 }

diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all
index 2b12c383989458fd94cf98c680400759ec8dd308..7cd492b9f21ba5ee69c97c7acf3c3951f593176e 100644 (file)
--- a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all
+++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all
@@ -11,7 +11,7 @@ osd_scenario: collocated
 dmcrypt: true
 osd_objectstore: bluestore
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 os_tuning_params:
   - { name: kernel.pid_max, value: 4194303 }

diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all
index 9cd8f003098888823bcb6a45ff6fb997c563df29..902bb4f93683a6c94162a64a8fbb88c7c1410898 100644 (file)
--- a/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all
+++ b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all
@@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080
 osd_scenario: non-collocated
 osd_objectstore: bluestore
 devices:
-  - /dev/sda
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - /dev/sdb
 dedicated_devices:
   - /dev/sdc

diff --git a/tests/functional/centos/7/bs-jrn-col/group_vars/all b/tests/functional/centos/7/bs-jrn-col/group_vars/all
index 8e4baf863d3d8c2cba07d848a3e3473a1249b109..827347f7a1395679bd80f6330db30b06da4a4da0 100644 (file)
--- a/tests/functional/centos/7/bs-jrn-col/group_vars/all
+++ b/tests/functional/centos/7/bs-jrn-col/group_vars/all
@@ -9,7 +9,7 @@ public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
 journal_size: 100
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 osd_scenario: collocated
 osd_objectstore: "bluestore"

diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
index a581e80422357330b484253cf0b0a9f769d24cd2..d7a773695bc52884ae13485554ac4d598b7000b0 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -9,7 +9,7 @@ journal_size: 100
 radosgw_interface: eth1
 osd_objectstore: filestore
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'

diff --git a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all
index 1d56e1341ed8b45785892b93ca03832a6ba3c99c..62ffcebba74adb7d1b1dc694014846655f63c60f 100644 (file)
--- a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all
+++ b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all
@@ -11,7 +11,7 @@ osd_scenario: non-collocated
 dmcrypt: true
 osd_objectstore: filestore
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'

diff --git a/tests/functional/centos/7/crypt-jrn-col/group_vars/all b/tests/functional/centos/7/crypt-jrn-col/group_vars/all
index 354ccf31ba72f71f45f5a3178984ac753b98bac9..c3bc36ad57eb3a5ad4796d8f14231cb57e28f43c 100644 (file)
--- a/tests/functional/centos/7/crypt-jrn-col/group_vars/all
+++ b/tests/functional/centos/7/crypt-jrn-col/group_vars/all
@@ -11,7 +11,7 @@ osd_scenario: collocated
 osd_objectstore: filestore
 dmcrypt: true
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 os_tuning_params:
   - { name: kernel.pid_max, value: 4194303 }

diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all
index 6d7eea081fa16b227819d6fd8c1604168663b9c2..05f41d63e7dc1926b200a5e18b45963a3e17bb22 100644 (file)
--- a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all
+++ b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all
@@ -17,6 +17,6 @@ osd_objectstore: filestore
 dmcrypt: true
 ceph_rgw_civetweb_port: 8080
 devices:
-  - /dev/sda
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - /dev/sdb
 ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1

diff --git a/tests/functional/centos/7/docker-ded-jrn/group_vars/all b/tests/functional/centos/7/docker-ded-jrn/group_vars/all
index 1c1ebc553713f3bf6db55fa3ccebaf2baa609230..be622361bf39aab11df9543b6fdcefa5cb9982c5 100644 (file)
--- a/tests/functional/centos/7/docker-ded-jrn/group_vars/all
+++ b/tests/functional/centos/7/docker-ded-jrn/group_vars/all
@@ -16,7 +16,7 @@ ceph_rgw_civetweb_port: 8080
 osd_objectstore: filestore
 osd_scenario: non-collocated
 devices:
-  - /dev/sda
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - /dev/sdb
 dedicated_devices:
   - /dev/sdc

diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all
index d703a67c3b8d7d6b92aa71895f068738268215c4..3f260c60a27774316e81a05de61964f2ce4c1162 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/all
+++ b/tests/functional/centos/7/docker/group_vars/all
@@ -17,7 +17,7 @@ ceph_rgw_civetweb_port: 8080
 osd_objectstore: filestore
 ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
 devices:
-  - /dev/sda
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - /dev/sdb
 ceph_osd_docker_run_script_path: /var/tmp
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/centos/7/jrn-col/group_vars/all b/tests/functional/centos/7/jrn-col/group_vars/all
index fe9e227390e7f7d58b7ceb1f31827b6b3c9616c8..871d4e5c898e783ead0a34f1d7100addeb7bd589 100644 (file)
--- a/tests/functional/centos/7/jrn-col/group_vars/all
+++ b/tests/functional/centos/7/jrn-col/group_vars/all
@@ -10,7 +10,7 @@ radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: filestore
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 osd_scenario: collocated
 os_tuning_params:

diff --git a/tests/functional/tests/osd/test_journal_collocation.py b/tests/functional/tests/osd/test_journal_collocation.py
index f651de4537e086934d77e13547d86906beec85bf..96c18e3799281ffcb64f92047f9af51ce380f24e 100644 (file)
--- a/tests/functional/tests/osd/test_journal_collocation.py
+++ b/tests/functional/tests/osd/test_journal_collocation.py
@@ -7,4 +7,4 @@ class TestOSD(object):
         if osd_auto_discovery:
             node["vars"]["devices"] = ["/dev/sda", "/dev/sdb", "/dev/sdc"] # Hardcoded since we can't retrieve the devices list generated during playbook run
         for device in node["vars"]["devices"]:
-            assert host.check_output("sudo blkid -s PARTLABEL -o value %s2" % device) in ["ceph journal", "ceph block"]
+            assert host.check_output("sudo blkid -s PARTLABEL -o value $(readlink -f %s)2" % device) in ["ceph journal", "ceph block"]

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index 593e6c987e36734d843e7f6e8cc3ba29554cbce8..a2ae75705790b957499b759316fd41e891879c95 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -9,7 +9,7 @@ monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 devices:
-  - '/dev/sda'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'