From 2c9e9739d6609c899203327357a1bfe1d8efd29c Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 17 Dec 2019 11:57:23 +0000 Subject: [PATCH 1/2] Fix name of swift storage-region option --- zaza/openstack/utilities/swift.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaza/openstack/utilities/swift.py b/zaza/openstack/utilities/swift.py index 67daca0..2b1f46a 100644 --- a/zaza/openstack/utilities/swift.py +++ b/zaza/openstack/utilities/swift.py @@ -204,7 +204,7 @@ def get_swift_storage_topology(model_name=None): app_config = zaza.model.get_application_config( app_name, model_name=model_name) - region = app_config['region']['value'] + 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[unit.public_address] = { From 721f3bc90554bc22969c96cb9a8f0671d0c6863a Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 17 Dec 2019 12:21:39 +0000 Subject: [PATCH 2/2] Fix unit test --- unit_tests/utilities/test_zaza_utilities_swift.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_tests/utilities/test_zaza_utilities_swift.py b/unit_tests/utilities/test_zaza_utilities_swift.py index 8c87556..c5fc3da 100644 --- a/unit_tests/utilities/test_zaza_utilities_swift.py +++ b/unit_tests/utilities/test_zaza_utilities_swift.py @@ -104,7 +104,7 @@ class TestSwiftUtils(ut_utils.BaseTestCase): region = int(app_name.split('-')[2].replace('region', '')) zone = int(app_name.split('-')[3].replace('zone', '')) app_config[app_name] = { - 'region': {'value': region}, + 'storage-region': {'value': region}, 'zone': {'value': zone}} self.get_application_config.side_effect = \