Merge "Munge region_name to '' if set to None"

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],