ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 38f289b691ed1275bdf7342a4347434ed340c8fc)

diff --git a/src/ceph-volume/ceph_volume/tests/util/test_device.py b/src/ceph-volume/ceph_volume/tests/util/test_device.py
index 5a5e520d8717b9a22e394c6c38f9396ce3a9ac95..ca90453892fe2338262ae6f49872a9a8d6e78968 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/util/test_device.py
+++ b/src/ceph-volume/ceph_volume/tests/util/test_device.py
@@ -147,6 +147,13 @@ class TestDevice(object):
         disk = device.Device("/dev/sda")
         assert not disk.used_by_ceph
 
+    def test_get_device_id(self, device_info):
+        udev = {k:k for k in ['ID_VENDOR', 'ID_MODEL', 'ID_SCSI_SERIAL']}
+        device_info(udevadm=udev)
+        disk = device.Device("/dev/sda")
+        assert disk._get_device_id() == 'ID_VENDOR_ID_MODEL_ID_SCSI_SERIAL'
+
+
 
 class TestDeviceEncryption(object):
 

diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py
index 1569682ae2d40c42765ba6c31e153b373b462202..fb7a411985dafa1cb3783ad9f5b9f1000a9f14ed 100644 (file)
--- a/src/ceph-volume/ceph_volume/util/device.py
+++ b/src/ceph-volume/ceph_volume/util/device.py
@@ -192,10 +192,10 @@ class Device(object):
                  'ID_SCSI_SERIAL']
         p = disk.udevadm_property(self.abspath, props)
         if 'ID_VENDOR' in p and 'ID_MODEL' in p and 'ID_SCSI_SERIAL' in p:
-            dev_id = '_'.join(p['ID_VENDOR'], p['ID_MODEL'],
-                              p['ID_SCSI_SERIAL'])
+            dev_id = '_'.join([p['ID_VENDOR'], p['ID_MODEL'],
+                              p['ID_SCSI_SERIAL']])
         elif 'ID_MODEL' in p and 'ID_SERIAL_SHORT' in p:
-            dev_id = '_'.join(p['ID_MODEL'], p['ID_SERIAL_SHORT'])
+            dev_id = '_'.join([p['ID_MODEL'], p['ID_SERIAL_SHORT']])
         elif 'ID_SERIAL' in p:
             dev_id = p['ID_SERIAL']
             if dev_id.startswith('MTFD'):