diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-29 23:57:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-29 23:57:11 +0000 |
commit | a1dd760339cfe9022bd4826181e4dbe80cb8dd58 (patch) | |
tree | 947fdad11c43d116a34296dd7d9f39cdef2a4a69 | |
parent | 7be6db82d35a7c3402172e742bb19dfa5a95a472 (diff) | |
parent | 17e019a08e6e8fed7da6d0de403e5525d997095b (diff) | |
download | os-client-config-a1dd760339cfe9022bd4826181e4dbe80cb8dd58.tar.gz |
Merge "Munge region_name to '' if set to None"
-rw-r--r-- | os_client_config/config.py | 2 | ||||
-rw-r--r-- | os_client_config/tests/test_config.py | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 89015cc..d5b1ab5 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -395,6 +395,8 @@ class OpenStackConfig(object): return [self._expand_region_name(new_cloud['region_name'])] def _get_region(self, cloud=None, region_name=''): + if region_name is None: + region_name = '' if not cloud: return self._expand_region_name(region_name) diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py index 3ea6690..b2ee9bb 100644 --- a/os_client_config/tests/test_config.py +++ b/os_client_config/tests/test_config.py @@ -246,6 +246,13 @@ class TestConfig(base.TestCase): region_name='override-region') self.assertEqual(region, {'name': 'override-region', 'values': {}}) + def test_get_region_region_is_none(self): + c = config.OpenStackConfig(config_files=[self.cloud_yaml], + vendor_files=[self.vendor_yaml], + secure_files=[self.no_yaml]) + region = c._get_region(cloud='_test-cloud_no_region', region_name=None) + self.assertEqual(region, {'name': '', 'values': {}}) + def test_get_region_region_set(self): c = config.OpenStackConfig(config_files=[self.cloud_yaml], vendor_files=[self.vendor_yaml], |