diff options
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 104 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 6 | ||||
| -rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 69 | ||||
| -rw-r--r-- | snaps/openstack/tests/os_source_file_test.py | 3 |
4 files changed, 138 insertions, 44 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) diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index ebdb76a..6ea4ffc 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -1139,11 +1139,11 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): """ from snaps.openstack.utils import nova_utils nova = nova_utils.nova_client(self.admin_os_creds) - zones = nova_utils.get_nova_availability_zones(nova) + zone_hosts = nova_utils.get_availability_zone_hosts(nova) # Create Instance on each server/zone ctr = 0 - for zone in zones: + for zone in zone_hosts: inst_name = self.vm_inst_name + '-' + zone ctr += 1 port_settings = PortSettings( @@ -1164,7 +1164,7 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): # Validate instances to ensure they've been deployed to the correct # server index = 0 - for zone in zones: + for zone in zone_hosts: creator = self.inst_creators[index] self.assertTrue(creator.vm_active(block=True)) info = creator.get_vm_info() diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 59c7395..9cf2028 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -21,7 +21,6 @@ from snaps.openstack.create_image import ImageSettings from snaps.openstack.create_network import NetworkSettings, SubnetSettings from snaps.openstack.create_router import RouterSettings from snaps.openstack.os_credentials import OSCreds, ProxySettings -from snaps.openstack.utils import glance_utils __author__ = 'spisarski' @@ -68,18 +67,6 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, if not proj_name: proj_name = config.get('OS_TENANT_NAME') - proj_domain_id = 'default' - user_domain_id = 'default' - - if config.get('OS_PROJECT_DOMAIN_ID'): - proj_domain_id = config['OS_PROJECT_DOMAIN_ID'] - if config.get('OS_USER_DOMAIN_ID'): - user_domain_id = config['OS_USER_DOMAIN_ID'] - if config.get('OS_IDENTITY_API_VERSION'): - version = int(config['OS_IDENTITY_API_VERSION']) - else: - version = 2 - proxy_settings = None if proxy_settings_str: tokens = re.split(':', proxy_settings_str) @@ -97,26 +84,24 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, if config.get('OS_INTERFACE'): interface = config.get('OS_INTERFACE') - os_creds = OSCreds(username=config['OS_USERNAME'], - password=config['OS_PASSWORD'], - auth_url=config['OS_AUTH_URL'], - project_name=proj_name, - identity_api_version=version, - user_domain_id=user_domain_id, - project_domain_id=proj_domain_id, - interface=interface, - proxy_settings=proxy_settings, - cacert=https_cacert) + creds_dict = { + 'username': config['OS_USERNAME'], + 'password': config['OS_PASSWORD'], + 'auth_url': config['OS_AUTH_URL'], + 'project_name': proj_name, + 'identity_api_version': config.get('OS_IDENTITY_API_VERSION'), + 'image_api_version': config.get('OS_IMAGE_API_VERSION'), + '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'), + 'interface': interface, + 'proxy_settings': proxy_settings, + 'cacert': https_cacert} else: logger.info('Reading development os_env file - ' + dev_os_env_file) config = file_utils.read_yaml(dev_os_env_file) - identity_api_version = config.get('identity_api_version') - if not identity_api_version: - identity_api_version = 2 - - image_api_version = config.get('image_api_version') - if not image_api_version: - image_api_version = glance_utils.VERSION_2 proxy_settings = None proxy_str = config.get('http_proxy') @@ -126,14 +111,22 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, host=tokens[0], port=tokens[1], ssh_proxy_cmd=config.get('ssh_proxy_cmd')) - os_creds = OSCreds(username=config['username'], - password=config['password'], - auth_url=config['os_auth_url'], - project_name=config['project_name'], - identity_api_version=identity_api_version, - image_api_version=image_api_version, - proxy_settings=proxy_settings) - + creds_dict = { + 'username': config['username'], + 'password': config['password'], + 'auth_url': config['os_auth_url'], + 'project_name': config['project_name'], + 'identity_api_version': config.get('identity_api_version'), + 'image_api_version': config.get('image_api_version'), + 'network_api_version': config.get('network_api_version'), + 'compute_api_version': config.get('compute_api_version'), + 'heat_api_version': config.get('heat_api_version'), + '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')} + + os_creds = OSCreds(**creds_dict) logger.info('OS Credentials = %s', os_creds) return os_creds diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index 01aa88a..2ccee3f 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -14,6 +14,8 @@ # limitations under the License. import logging import pkg_resources +import requests +from requests.packages.urllib3.exceptions import InsecureRequestWarning import uuid import unittest @@ -27,6 +29,7 @@ from snaps.openstack.utils import deploy_utils, keystone_utils dev_os_env_file = pkg_resources.resource_filename( 'snaps.openstack.tests.conf', 'os_env.yaml') +requests.packages.urllib3.disable_warnings(InsecureRequestWarning) class OSComponentTestCase(unittest.TestCase): |