openstack
/
charm-nova-compute
Code Issues Proposed changes

Merge "Set cross_az_attach mode from ncc relation configuration"

This commit is contained in:
Zuul 2021-06-11 14:49:42 +00:00 committed by Gerrit Code Review
parent 203140252c 17e44e12e3
commit 06fbe4aa6c
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/nova_compute_context.py
View File

@ -503,6 +503,17 @@ class CloudComputeContext(context.OSContextGenerator):
rid=rid, unit=unit)
return volume_service
@property
def cross_az_attach(self):
# Default to True as that is the nova default
cross_az_attach = True
for rid in relation_ids('cloud-compute'):
for unit in related_units(rid):
setting = relation_get('cross_az_attach', rid=rid, unit=unit)
if setting is not None:
cross_az_attach = setting
return cross_az_attach
@property
def region(self):
region = None
@ -733,6 +744,7 @@ class CloudComputeContext(context.OSContextGenerator):
vol_service = self.volume_context()
if vol_service:
ctxt['volume_service'] = vol_service
ctxt['cross_az_attach'] = self.cross_az_attach
if self.restart_trigger():
ctxt['restart_trigger'] = self.restart_trigger()

1
templates/parts/section-cinder
View File

@ -6,4 +6,5 @@ catalog_info = {{ volume_catalog_info }}
{% if region -%}
os_region_name = {{ region }}
{% endif %}
cross_az_attach = {{ cross_az_attach }}
{% endif -%}

27
unit_tests/test_nova_compute_contexts.py
View File

@ -132,7 +132,32 @@ class NovaComputeContextTests(CharmTestCase):
self.related_units.return_value = 'nova-cloud-controller/0'
cloud_compute = context.CloudComputeContext()
self.test_relation.set({'volume_service': 'cinder'})
self.assertEqual({'volume_service': 'cinder'}, cloud_compute())
self.assertEqual({'volume_service': 'cinder',
'cross_az_attach': True}, cloud_compute())
@patch.object(context, '_network_manager')
def test_cloud_compute_cross_az_context(self, netman):
netman.return_value = None
self.relation_ids.return_value = 'cloud-compute:1'
self.related_units.return_value = 'nova-cloud-controller/0'
cloud_compute = context.CloudComputeContext()
# Check no cross_az_attach value set, defaults to cross_az_attach=True
self.test_relation.set({'volume_service': 'cinder'})
self.assertEqual({'volume_service': 'cinder',
'cross_az_attach': True}, cloud_compute())
# Check that explicit True setting for cross_az_attach
self.test_relation.set({'volume_service': 'cinder',
'cross_az_attach': True})
self.assertEqual({'volume_service': 'cinder',
'cross_az_attach': True}, cloud_compute())
# Check false setting for cross_az_attach
self.test_relation.set({'volume_service': 'cinder',
'cross_az_attach': False})
self.assertEqual({'volume_service': 'cinder',
'cross_az_attach': False}, cloud_compute())
@patch.object(context, '_network_manager')
def test_cloud_compute_flatdhcp_context(self, netman):