Use absolute import path for ceph_helpers

Ensures that things work OK when charms.ceph is used from within
a virtualenv.

Change-Id: I06ce657a6910835359dc03471dc14a5740725e98
This commit is contained in:
James Page 2017-03-10 12:13:20 +00:00
parent 195d002ab1
commit c7a2595fab
2 changed files with 3 additions and 3 deletions

View File

@ -28,7 +28,7 @@ from ceph import (
get_cephfs,
get_osd_weight
)
from ceph_helpers import Crushmap
from ceph.ceph_helpers import Crushmap
from charmhelpers.contrib.storage.linux.ceph import (
create_erasure_profile,
delete_pool,

View File

@ -345,8 +345,8 @@ class CephBrokerTestCase(unittest.TestCase):
self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')
@mock.patch('ceph_broker.check_output')
@mock.patch('ceph_helpers.Crushmap.load_crushmap')
@mock.patch('ceph_helpers.Crushmap.ensure_bucket_is_present')
@mock.patch('ceph.ceph_helpers.Crushmap.load_crushmap')
@mock.patch('ceph.ceph_helpers.Crushmap.ensure_bucket_is_present')
@mock.patch('ceph_broker.get_osd_weight')
@mock.patch('ceph_broker.log')
def test_process_requests_move_osd(self,