From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 10 Dec 2018 13:38:08 +0000 (+0100)
Subject: ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)
X-Git-Tag: v12.2.11~93^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25772%2Fhead;p=ceph.git

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 5a5e520d8717..ca90453892fe 100644
--- 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 1569682ae2d4..fb7a411985da 100644
--- 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'):