summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Page <james.page@ubuntu.com>2017-03-10 12:13:20 +0000
committerJames Page <james.page@ubuntu.com>2017-03-10 12:17:12 +0000
commitc7a2595fab7400b3e703496457267c73796d1aa2 (patch)
tree0caed82b006f5e2eb15bbb02803c79760919850f
parent195d002ab17846e1cebb8ca384cc3a9a79ee5ec9 (diff)
Use absolute import path for ceph_helpers
Ensures that things work OK when charms.ceph is used from within a virtualenv. Change-Id: I06ce657a6910835359dc03471dc14a5740725e98
Notes
Notes (review): Code-Review+2: Chris MacNaughton <chris.macnaughton@canonical.com> Code-Review+2: James Page <james.page@canonical.com> Workflow+1: James Page <james.page@canonical.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 10 Mar 2017 12:36:22 +0000 Reviewed-on: https://review.openstack.org/444258 Project: openstack/charms.ceph Branch: refs/heads/master
-rw-r--r--ceph/ceph_broker.py2
-rw-r--r--unit_tests/test_ceph_broker.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/ceph/ceph_broker.py b/ceph/ceph_broker.py
index 8a99805..f1e59da 100644
--- a/ceph/ceph_broker.py
+++ b/ceph/ceph_broker.py
@@ -28,7 +28,7 @@ from ceph import (
28 get_cephfs, 28 get_cephfs,
29 get_osd_weight 29 get_osd_weight
30) 30)
31from ceph_helpers import Crushmap 31from ceph.ceph_helpers import Crushmap
32from charmhelpers.contrib.storage.linux.ceph import ( 32from charmhelpers.contrib.storage.linux.ceph import (
33 create_erasure_profile, 33 create_erasure_profile,
34 delete_pool, 34 delete_pool,
diff --git a/unit_tests/test_ceph_broker.py b/unit_tests/test_ceph_broker.py
index d8453f3..752e7a0 100644
--- a/unit_tests/test_ceph_broker.py
+++ b/unit_tests/test_ceph_broker.py
@@ -345,8 +345,8 @@ class CephBrokerTestCase(unittest.TestCase):
345 self.assertEqual(json.loads(rc)['request-id'], '1ef5aede') 345 self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')
346 346
347 @mock.patch('ceph_broker.check_output') 347 @mock.patch('ceph_broker.check_output')
348 @mock.patch('ceph_helpers.Crushmap.load_crushmap') 348 @mock.patch('ceph.ceph_helpers.Crushmap.load_crushmap')
349 @mock.patch('ceph_helpers.Crushmap.ensure_bucket_is_present') 349 @mock.patch('ceph.ceph_helpers.Crushmap.ensure_bucket_is_present')
350 @mock.patch('ceph_broker.get_osd_weight') 350 @mock.patch('ceph_broker.get_osd_weight')
351 @mock.patch('ceph_broker.log') 351 @mock.patch('ceph_broker.log')
352 def test_process_requests_move_osd(self, 352 def test_process_requests_move_osd(self,