diff options
Diffstat (limited to 'snaps/openstack/tests')
-rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 17 | ||||
-rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 13 |
2 files changed, 22 insertions, 8 deletions
diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index cde8161..e7c34b9 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -162,6 +162,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) + self.assertIsNone(os_creds.region_name) def test_minimal_kwargs(self): os_creds = OSCreds(**{'username': 'foo', 'password': 'bar', @@ -180,6 +181,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) + self.assertIsNone(os_creds.region_name) def test_all_kwargs_versions_str(self): os_creds = OSCreds( @@ -187,7 +189,7 @@ class OSCredsUnitTests(unittest.TestCase): 'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello', 'identity_api_version': '5', 'image_api_version': '6', 'compute_api_version': '7', 'heat_api_version': '8.0', - 'cacert': 'true'}) + 'cacert': 'true', 'region_name': 'test_region'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) @@ -201,6 +203,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) + self.assertEqual('test_region', os_creds.region_name) def test_all_kwargs_versions_num(self): os_creds = OSCreds( @@ -208,7 +211,7 @@ class OSCredsUnitTests(unittest.TestCase): 'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello', 'identity_api_version': 5, 'image_api_version': 6, 'compute_api_version': 7, 'heat_api_version': 8.0, - 'cacert': True}) + 'cacert': True, 'region_name': 'test_region'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) @@ -222,6 +225,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) + self.assertEqual('test_region', os_creds.region_name) def test_proxy_settings_obj(self): proxy_settings = ProxySettings(host='foo', port=1234) @@ -243,13 +247,15 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('foo', os_creds.proxy_settings.host) self.assertEqual(1234, os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) + self.assertIsNone(os_creds.region_name) def test_proxy_settings_obj_kwargs(self): proxy_settings = ProxySettings(host='foo', port=1234) os_creds = OSCreds(**{'username': 'foo', 'password': 'bar', 'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello', - 'proxy_settings': proxy_settings}) + 'proxy_settings': proxy_settings, + 'region_name': 'test_region'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) @@ -265,6 +271,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('foo', os_creds.proxy_settings.host) self.assertEqual(1234, os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) + self.assertEqual('test_region', os_creds.region_name) def test_proxy_settings_dict(self): os_creds = OSCreds( @@ -290,7 +297,8 @@ class OSCredsUnitTests(unittest.TestCase): os_creds = OSCreds(**{'username': 'foo', 'password': 'bar', 'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello', - 'proxy_settings': {'host': 'foo', 'port': 1234}}) + 'proxy_settings': {'host': 'foo', 'port': 1234}, + 'region_name': 'test_region'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) @@ -306,3 +314,4 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('foo', os_creds.proxy_settings.host) self.assertEqual(1234, os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) + self.assertEqual('test_region', os_creds.region_name) diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 855beb5..67269c6 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -93,11 +93,14 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, 'network_api_version': config.get('OS_NETWORK_API_VERSION'), 'compute_api_version': config.get('OS_COMPUTE_API_VERSION'), 'heat_api_version': config.get('OS_HEAT_API_VERSION'), - 'user_domain_id': config.get('OS_USER_DOMAIN_ID'), - 'project_domain_id': config.get('OS_PROJECT_DOMAIN_ID'), + 'user_domain_id': config.get( + 'OS_USER_DOMAIN_ID', config.get('OS_USER_DOMAIN_NAME')), + 'project_domain_id': config.get( + 'OS_PROJECT_DOMAIN_ID', config.get('OS_PROJECT_DOMAIN_NAME')), 'interface': interface, 'proxy_settings': proxy_settings, - 'cacert': https_cacert} + 'cacert': https_cacert, + 'region_name': config.get('OS_REGION_NAME')} else: logger.info('Reading development os_env file - ' + dev_os_env_file) config = file_utils.read_yaml(dev_os_env_file) @@ -123,7 +126,9 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, 'user_domain_id': config.get('user_domain_id'), 'project_domain_id': config.get('project_domain_id'), 'interface': config.get('interface'), - 'proxy_settings': proxy_settings, 'cacert': config.get('cacert')} + 'proxy_settings': proxy_settings, + 'cacert': config.get('cacert'), + 'region_name': config.get('region_name')} os_creds = OSCreds(**creds_dict) logger.info('OS Credentials = %s', os_creds) |