diff options
author | 2017-07-18 09:37:07 -0600 | |
---|---|---|
committer | 2017-07-20 11:27:52 -0600 | |
commit | dc7c6640c95a40623603964df6fde4adcca41e5c (patch) | |
tree | 39f7441e2ccf3345add2888dc49b3ed739d2533e /snaps/openstack/tests/conf/os_credentials_tests.py | |
parent | acda399def76b37345f298c7df14ae2594cdc147 (diff) |
Changes required for running CI tests (Pike pod).
Added support for HTTPS proxies
HTTPS OSCreds settings for both RC file and os_env.yaml
OSCreds 'cacert' T/F and cert file path support
OSCreds API version support cleanup including the addition
of heat
Added more OSCreds test validations
Disabling of InsecureRequestWarning
PEP8 line width refactoring
heat_utils_test.py fix when stack status is error
test suite for CI
removed default flavor metadata of mem_page_size: Any to None
JIRA: SNAPS-80
Change-Id: I333e83ca79d7403bf43a9b74da4c072b4da976ba
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests/conf/os_credentials_tests.py')
-rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 104 |
1 files changed, 101 insertions, 3 deletions
diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index 1c61b41..a4cfa61 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -57,26 +57,36 @@ class ProxySettingsUnitTests(unittest.TestCase): proxy_settings = ProxySettings(host='foo', port=1234) self.assertEqual('foo', proxy_settings.host) self.assertEqual(1234, proxy_settings.port) + self.assertEqual('foo', proxy_settings.https_host) + self.assertEqual(1234, proxy_settings.https_port) self.assertIsNone(proxy_settings.ssh_proxy_cmd) def test_minimum_kwargs(self): proxy_settings = ProxySettings(**{'host': 'foo', 'port': 1234}) self.assertEqual('foo', proxy_settings.host) self.assertEqual(1234, proxy_settings.port) + self.assertEqual('foo', proxy_settings.https_host) + self.assertEqual(1234, proxy_settings.https_port) self.assertIsNone(proxy_settings.ssh_proxy_cmd) def test_all(self): - proxy_settings = ProxySettings(host='foo', port=1234, - ssh_proxy_cmd='proxy command') + proxy_settings = ProxySettings( + host='foo', port=1234, https_host='bar', https_port=2345, + ssh_proxy_cmd='proxy command') self.assertEqual('foo', proxy_settings.host) self.assertEqual(1234, proxy_settings.port) + self.assertEqual('bar', proxy_settings.https_host) + self.assertEqual(2345, proxy_settings.https_port) self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd) def test_all_kwargs(self): proxy_settings = ProxySettings( - **{'host': 'foo', 'port': 1234, 'ssh_proxy_cmd': 'proxy command'}) + **{'host': 'foo', 'port': 1234, 'https_host': 'bar', + 'https_port': 2345, 'ssh_proxy_cmd': 'proxy command'}) self.assertEqual('foo', proxy_settings.host) self.assertEqual(1234, proxy_settings.port) + self.assertEqual('bar', proxy_settings.https_host) + self.assertEqual(2345, proxy_settings.https_port) self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd) @@ -143,6 +153,14 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) def test_minimal_kwargs(self): @@ -153,6 +171,54 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) + self.assertIsNone(os_creds.proxy_settings) + + def test_all_kwargs_versions_str(self): + os_creds = OSCreds( + **{'username': 'foo', 'password': 'bar', + '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'}) + self.assertEqual('foo', os_creds.username) + self.assertEqual('bar', os_creds.password) + self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) + self.assertEqual('hello', os_creds.project_name) + self.assertEqual(5, os_creds.identity_api_version) + self.assertEqual(6, os_creds.image_api_version) + self.assertEqual(7, os_creds.compute_api_version) + self.assertEqual(8.0, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) + self.assertIsNone(os_creds.proxy_settings) + + def test_all_kwargs_versions_num(self): + os_creds = OSCreds( + **{'username': 'foo', 'password': 'bar', + '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}) + self.assertEqual('foo', os_creds.username) + self.assertEqual('bar', os_creds.password) + self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) + self.assertEqual('hello', os_creds.project_name) + self.assertEqual(5, os_creds.identity_api_version) + self.assertEqual(6, os_creds.image_api_version) + self.assertEqual(7, os_creds.compute_api_version) + self.assertEqual(8.0, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) def test_proxy_settings_obj(self): @@ -164,6 +230,14 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) 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) @@ -178,6 +252,14 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) 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) @@ -190,6 +272,14 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) 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) @@ -203,6 +293,14 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('bar', os_creds.password) self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) + self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(2, os_creds.image_api_version) + self.assertEqual(2, os_creds.compute_api_version) + self.assertEqual(1, os_creds.heat_api_version) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('admin', os_creds.interface) + self.assertTrue(os_creds.cacert) 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) |