openstack
/
charm-nova-compute
Code Issues Proposed changes

Make context value match config expectation 

Change-Id: Id3c37583f5b0499a24a22aee493492dbc2dc96ee
This commit is contained in:
Chris MacNaughton 2017-06-07 13:50:58 +02:00
parent 087cfca004
commit 3d241460a7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/nova_compute_context.py
View File

@ -131,14 +131,14 @@ def nova_metadata_requirement():
class LxdContext(context.OSContextGenerator):
def __call__(self):
lxd_context = {
'pool': None
'storage_pool': None
}
for rid in relation_ids('lxd'):
for unit in related_units(rid):
rel = {'rid': rid, 'unit': unit}
lxd_context = {
'pool': relation_get(
'storage_pool': relation_get(
'pool', **rel)
}
return lxd_context

4
unit_tests/test_nova_compute_contexts.py
View File

@ -83,11 +83,11 @@ class LxdContextTests(CharmTestCase):
def test_with_pool(self):
self.test_relation.set({'pool': 'juju_lxd'})
lxd = context.LxdContext()()
self.assertEqual(lxd.get('pool'), 'juju_lxd')
self.assertEqual(lxd.get('storage_pool'), 'juju_lxd')
def test_without_pool(self):
lxd = context.LxdContext()()
self.assertEqual(lxd.get('pool'), None)
self.assertEqual(lxd.get('storage_pool'), None)
class NovaComputeContextTests(CharmTestCase):