Merge pull request ceph#19285 from ceph/wip-rm22299

ceph-volume Format correctly when vg/lv cannot be used

Reviewed-by: Andrew Schoen <[email protected]>

src/ceph-volume/ceph_volume/devices/lvm/prepare.py

@@ -155,8 +155,8 @@ def prepare_device(self, arg, device_type, cluster_fsid, osd_fsid):
                 tags={'ceph.type': device_type})
         else:
             error = [
-                'Cannot use device (%s).',
-                'A vg/lv path or an existing device is needed' % arg]
+                'Cannot use device (%s).' % arg,
+                'A vg/lv path or an existing device is needed']
             raise RuntimeError(' '.join(error))
 
         raise RuntimeError('no data logical volume found with: %s' % arg)

src/ceph-volume/ceph_volume/tests/devices/lvm/test_prepare.py

@@ -22,6 +22,15 @@ def test_main_shows_prepare_subcommands(self, capsys):
         assert 'Format an LVM device' in stdout
 
 
+class TestPrepareDevice(object):
+
+    def test_cannot_use_device(self):
+        with pytest.raises(RuntimeError) as error:
+            lvm.prepare.Prepare([]).prepare_device(
+                    '/dev/var/foo', 'data', 'asdf', '0')
+        assert 'Cannot use device (/dev/var/foo)' in str(error)
+        assert 'A vg/lv path or an existing device is needed' in str(error)
+
 class TestPrepare(object):
 
     def test_main_spits_help_with_no_arguments(self, capsys):