From 39ee25637b92084861df176c729ea1765020329f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 29 Sep 2017 13:32:19 +0200 Subject: [PATCH] test: add test for device with 'by-path' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- tests/conftest.py | 6 +++++- tests/functional/centos/7/bluestore/group_vars/all | 2 +- tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all | 2 +- .../centos/7/bs-dock-crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/bs-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/cluster/group_vars/all | 2 +- tests/functional/centos/7/crypt-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/crypt-jrn-col/group_vars/all | 2 +- .../functional/centos/7/docker-crypt-jrn-col/group_vars/all | 2 +- tests/functional/centos/7/docker-ded-jrn/group_vars/all | 2 +- tests/functional/centos/7/docker/group_vars/all | 2 +- tests/functional/centos/7/jrn-col/group_vars/all | 2 +- tests/functional/tests/osd/test_journal_collocation.py | 2 +- tests/functional/ubuntu/16.04/cluster/group_vars/all | 2 +- 16 files changed, 20 insertions(+), 16 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 2030b1346..5a4b5b51b 100644 --- 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 f500d0bbe..d053bd696 100644 --- 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 0b1b2dad4..59054a4ab 100644 --- 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 247228ea6..b0a5376b7 100644 --- 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 2b12c3839..7cd492b9f 100644 --- 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 9cd8f0030..902bb4f93 100644 --- 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 8e4baf863..827347f7a 100644 --- 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 a581e8042..d7a773695 100644 --- 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 1d56e1341..62ffcebba 100644 --- 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 354ccf31b..c3bc36ad5 100644 --- 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 6d7eea081..05f41d63e 100644 --- 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 1c1ebc553..be622361b 100644 --- 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 d703a67c3..3f260c60a 100644 --- 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 fe9e22739..871d4e5c8 100644 --- 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 f651de453..96c18e379 100644 --- 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 593e6c987..a2ae75705 100644 --- 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' -- 2.47.3