arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #868 from gnuoy/fix-swift-replica-tests

Browse Source 
Respect model in get_swift_storage_topology
This commit is contained in:
Frode Nordahl
2022-09-06 10:34:30 +02:00
committed by GitHub
parent c57ac56951 17234c9e15
commit a53ad38e75
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unit_tests/utilities/test_zaza_utilities_swift.py
View File

@@ -93,7 +93,7 @@ class TestSwiftUtils(ut_utils.BaseTestCase):
self.patch_object(zaza.model, 'get_units')
self.patch_object(zaza.model, 'get_unit_public_address')
def _get_unit_public_address(u):
def _get_unit_public_address(u, model_name=None):
return u.public_address
self.get_unit_public_address.side_effect = _get_unit_public_address

5
zaza/openstack/utilities/swift.py
View File

@@ -207,7 +207,10 @@ def get_swift_storage_topology(model_name=None):
region = app_config['storage-region']['value']
zone = app_config['zone']['value']
for unit in zaza.model.get_units(app_name, model_name=model_name):
topology[zaza.model.get_unit_public_address(unit)] = {
unit_ip = zaza.model.get_unit_public_address(
unit,
model_name=model_name)
topology[unit_ip] = {
'app_name': app_name,
'unit': unit,
'region': region,