Merge lp:~bjornt/charms/trusty/ceph/symlinks into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Björn Tillenius]

Handle symlinks in the osd-devices config.

If a path is a symlink, get_devices() will resolve it so that
the check if the disk is mounted works properly.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #17245 ceph-next for bjornt mp284754
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/17245/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #18509 ceph-next for bjornt mp284754
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/14858267/
Build: http://10.245.162.77:8080/job/charm_lint_check/18509/

[lp:~bjornt/charms/trusty/ceph/symlinks]

132. By Björn Tillenius on 2016-02-02

Lint.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #18510 ceph-next for bjornt mp284754
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/18510/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #17247 ceph-next for bjornt mp284754
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/17247/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9153 ceph-next for bjornt mp284754
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/9153/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9155 ceph-next for bjornt mp284754
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/9155/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #121 ceph-next for bjornt mp284754
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/121/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #125 ceph-next for bjornt mp284754
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/125/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8 ceph-next for bjornt mp284754
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/8/

=== modified file 'hooks/ceph_hooks.py'
--- hooks/ceph_hooks.py	2016-01-22 15:37:01 +0000
+++ hooks/ceph_hooks.py	2016-02-02 17:02:06 +0000
@@ -231,7 +231,9 @@
 
 def get_devices():
     if config('osd-devices'):
-        devices = config('osd-devices').split(' ')
+        devices = [
+            os.path.realpath(path)
+            for path in config('osd-devices').split(' ')]
     else:
         devices = []
     # List storage instances for the 'osd-devices'

=== added file 'unit_tests/test_config.py'
--- unit_tests/test_config.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_config.py	2016-02-02 17:02:06 +0000
@@ -0,0 +1,58 @@
+import os.path
+import shutil
+import tempfile
+
+import test_utils
+
+import ceph_hooks as hooks
+
+TO_PATCH = [
+    'config',
+]
+
+
+class GetDevicesTestCase(test_utils.CharmTestCase):
+
+    def setUp(self):
+        super(GetDevicesTestCase, self).setUp(hooks, TO_PATCH)
+        self.config.side_effect = self.test_config.get
+        self.tmp_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp_dir)
+
+    def test_get_devices_empty(self):
+        """
+        If osd-devices is set to an empty string, get_devices() returns
+        an empty list.
+        """
+        self.test_config.set("osd-devices", "")
+        self.assertEqual([], hooks.get_devices())
+
+    def test_get_devices_non_existing_files(self):
+        """
+        If osd-devices points to a file that doesn't exist, it's still
+        returned by get_devices().
+        """
+        non_existing = os.path.join(self.tmp_dir, "no-such-file")
+        self.test_config.set("osd-devices", non_existing)
+        self.assertEqual([non_existing], hooks.get_devices())
+
+    def test_get_devices_multiple(self):
+        """
+        Multiple devices can be specified in osd-devices by separating
+        them with spaces.
+        """
+        device1 = os.path.join(self.tmp_dir, "device1")
+        device2 = os.path.join(self.tmp_dir, "device2")
+        self.test_config.set("osd-devices", "{} {}".format(device1, device2))
+        self.assertEqual([device1, device2], hooks.get_devices())
+
+    def test_get_devices_symlink(self):
+        """
+        If a symlink is specified in osd-devices, get_devices() resolves
+        it and returns the link target.
+        """
+        device = os.path.join(self.tmp_dir, "device")
+        link = os.path.join(self.tmp_dir, "link")
+        os.symlink(device, link)
+        self.test_config.set("osd-devices", link)
+        self.assertEqual([device], hooks.get_devices())