diff options
54 files changed, 1250 insertions, 337 deletions
@@ -3,3 +3,5 @@ *.*project build dist +.tox +docs/_build/* diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 0000000..b29addf --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,44 @@ +--- +project: 'SNAPS-OO' +project_creation_date: '07.02.2017' +project_category: '' +lifecycle_state: 'Incubation' +project_lead: &opnfv_snaps_ptl + name: 'Steven Pisarski' + email: 's.pisarski@cablelabs.com' + id: 'spisarski' + company: 'cablelabs.com' + timezone: 'Unknown' +primary_contact: *opnfv_snaps_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.opnfv.org/projects/SNAPS' + key: 'SNAPS' +mailing_list: + type: 'mailman2' + url: 'opnfv-tech-discuss@lists.opnfv.org' + tag: '[snaps]' +realtime_discussion: + type: irc + server: 'freenode.net' + channel: '#opnfv-snaps' +meetings: + - type: 'gotomeeting+irc' + agenda: # eg: 'https://wiki.opnfv.org/display/' + url: # eg: 'https://global.gotomeeting.com/join/819733085' + server: 'freenode.net' + channel: '#opnfv-meeting' + repeats: 'weekly' + time: # eg: '16:00 UTC' +repositories: + - 'snaps' +committers: + - <<: *opnfv_snaps_ptl + - name: 'Randy Levensalor' + email: 'r.levensalor@cablelabs.com' + company: 'cablelabs.com' + id: 'RandyL' +tsc: + # yamllint disable rule:line-length + approval: 'http//meetbot.opnfv.org/meetings/opnfv-meeting/2017/opnfv-meeting.2017-02-07-15.00.html' + # yamllint enable rule:line-length diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..3c4453e --- /dev/null +++ b/docs/conf.py @@ -0,0 +1 @@ +from docs_conf.conf import * diff --git a/docs/conf.yaml b/docs/conf.yaml new file mode 100644 index 0000000..0bb596d --- /dev/null +++ b/docs/conf.yaml @@ -0,0 +1,3 @@ +--- +project_cfg: opnfv +project: SNAPS diff --git a/docs/how-to-use/IntegrationTests.rst b/docs/how-to-use/IntegrationTests.rst index 82c2f90..79ef8ef 100644 --- a/docs/how-to-use/IntegrationTests.rst +++ b/docs/how-to-use/IntegrationTests.rst @@ -260,6 +260,12 @@ create_router_tests.py - CreateRouterSuccessTests | test_create_delete_router | 2 | Ensures that a router can be deleted via the | | | | OpenStackRouter.clean() method | +---------------------------------------+---------------+-----------------------------------------------------------+ +| test_create_with_internal_sub | 2 | Ensures that a router can be joined to a subnet created by| +| | | the same user who created the subnet | ++---------------------------------------+---------------+-----------------------------------------------------------+ +| test_create_with_invalid_internal_sub | 2 | Ensures that a router cannot be created when attempting to| +| | | join a subnet created by the admin user | ++---------------------------------------+---------------+-----------------------------------------------------------+ | test_create_router_admin_state_false | 2 | Ensures that a router can created with | | | | admin_state_up = False | +---------------------------------------+---------------+-----------------------------------------------------------+ @@ -318,6 +324,22 @@ create_router_tests.py - CreateRouterSecurityGroupTests | | | applied to it | +---------------------------------------+---------------+-----------------------------------------------------------+ +create_router_tests.py - CreateRouterSharedNetworksTests +-------------------------------------------------------- + ++---------------------------------------+---------------+-----------------------------------------------------------+ +| Test Name | Neutron API | Description | ++=======================================+===============+===========================================================+ +| test_create_router_external | 2 | Ensures that a router can be joined to an external network| +| | | that was created by an admin user | ++---------------------------------------+---------------+-----------------------------------------------------------+ +| test_create_router_port_external | 2 | Ensures that a router can have a port created to an | +| | | external network that was created by an admin user | ++---------------------------------------+---------------+-----------------------------------------------------------+ +| test_create_router_port_shared | 2 | Ensures that a router can have a port created to an | +| | | shared network that was created by an admin user | ++---------------------------------------+---------------+-----------------------------------------------------------+ + create_qos_tests.py - CreateQoSTests ------------------------------------ @@ -530,6 +552,17 @@ create_stack_tests.py - CreateStackNestedResourceTests | | | initialized OpenStackVmInstance objects | +---------------------------------------+---------------+-----------------------------------------------------------+ +create_stack_tests.py - CreateStackUpdateTests +---------------------------------------------- + ++---------------------------------------+---------------+-----------------------------------------------------------+ +| Test Name | Heat API | Description | ++=======================================+===============+===========================================================+ +| test_update | 1 | Ensures that an OpenStackHeatStack can have the number of | +| | | VMs updated and they are spawned and access can be | +| | | obtained with SSH over floating IPs | ++---------------------------------------+---------------+-----------------------------------------------------------+ + create_stack_tests.py - CreateStackRouterTests ---------------------------------------------- diff --git a/docs/how-to-use/LibraryUsage.rst b/docs/how-to-use/LibraryUsage.rst index aa7bf91..3183305 100644 --- a/docs/how-to-use/LibraryUsage.rst +++ b/docs/how-to-use/LibraryUsage.rst @@ -154,6 +154,10 @@ Create Flavor - is\_public - flag that denotes whether or not other projects can access image (default=True) - metadata - freeform dict() for special metadata (optional) + - freeform dict() for values of basic elements + (e.g. ram, vcpu, disk, etc) could be added. + As result the hard coded values of those elements will be + overwritten by the new ones (optional) .. code:: python diff --git a/docs/how-to-use/Testing.rst b/docs/how-to-use/Testing.rst index 92340ab..8e08abb 100644 --- a/docs/how-to-use/Testing.rst +++ b/docs/how-to-use/Testing.rst @@ -26,6 +26,8 @@ Execute the tests | \* -f [optional - When set, will execute tests requiring Floating IPS] | \* -im [optional - File containing image endpoints to override -| \* -fm [optional - JSON string containing a dict() for flavor metadata default='{\"hw:mem_page_size\": \"any\"}'] +| \* -fm [optional - JSON string containing a dict(): - for flavor metadata default='{\"hw:mem_page_size\": \"any\"}' + - for values of basic elements (e.g. ram, vcpu, disk, etc) could be added. + As result the hard coded values of those elements will be overwritten by the new ones] | \* -ci [optional - runs the tests required by SNAPS-OO CI] | \* -r [optional with default value of '1' - The number of test iterations to execute] diff --git a/docs/how-to-use/VirtEnvDeploy.rst b/docs/how-to-use/VirtEnvDeploy.rst index 6c99992..0345f34 100644 --- a/docs/how-to-use/VirtEnvDeploy.rst +++ b/docs/how-to-use/VirtEnvDeploy.rst @@ -121,7 +121,11 @@ Use launcher.py to deploy and clean up example environments. These examples are - rxtx\_factor: the receive/transmit factor to be set on ports if backend supports QoS extension (default 1.0) - is\_public: denotes whether or not the flavor is public (default = True) - - metadata: freeform dict() for special metadata (optional) + - metadata: - freeform dict() for special metadata (optional) + - freeform dict() for values of basic elements + (e.g. ram, vcpu, disk, etc) could be added. + As result the hard coded values of those elements will be + overwritten by the new ones (optional) - qos_specs: the QoS Specs to create diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..aceb2fc --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,16 @@ +.. _snaps: + +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. SPDX-License-Identifier CC-BY-4.0 +.. (c) Open Platform for NFV Project, Inc. and its contributors + +********************************* +OPNFV Snaps +********************************* + +.. toctree:: + :numbered: + :maxdepth: 3 + + /how-to-use/index diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..9fde2df --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +lfdocs-conf +sphinx_opnfv_theme diff --git a/examples/launch.py b/examples/launch.py index 04bc5d6..cfd7f65 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -32,6 +32,10 @@ logger = logging.getLogger('snaps_launcher') ARG_NOT_SET = "argument not set" +from warnings import warn +warn('This script will be removed in a subsequent release', + DeprecationWarning) + def main(arguments): """ diff --git a/requirements.txt b/requirements.txt index 91e67e6..6721540 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,10 +7,11 @@ python-keystoneclient>=3.8.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-heatclient>=1.10.0 # Apache-2.0 python-cinderclient>=3.3.0 # Apache-2.0 -python-magnumclient>=2.1.0 # Apache-2.0 -ansible<2.4,>=2.1.0 +python-magnumclient>=2.1.0,<2.3 # Apache-2.0 +ansible>=2.4 wrapt>=1.7.0 # BSD License scp cryptography>=2.1 # BSD/Apache-2.0 concurrencytest -six>=1.10.0 # MIT +Jinja2 # BSD License (3 clause) +keystoneauth1 # Apache-2.0 @@ -1,6 +1,6 @@ [metadata] -name = snaps -version = 1.0 +name = snaps-oo +version = 7.0.0 home-page = https://gerrit.opnfv.org/gerrit/gitweb?p=snaps.git;a=summary author = Steve Pisarski author-email = s.pisarski@cablelabs.com diff --git a/snaps/config/network.py b/snaps/config/network.py index eca8734..b142480 100644 --- a/snaps/config/network.py +++ b/snaps/config/network.py @@ -46,6 +46,7 @@ class NetworkConfig(object): :param segmentation_id: the id of the segmentation (this is required when network_type is 'vlan') :param subnets or subnet_settings: List of SubnetConfig objects. + :param mtu: MTU setting (optional) :return: """ @@ -88,6 +89,8 @@ class NetworkConfig(object): if not self.name or len(self.name) < 1: raise NetworkConfigError('Name required for networks') + self.mtu = kwargs.get('mtu') + def get_project_id(self, os_creds): """ Returns the project ID for a given project_name or None @@ -144,6 +147,8 @@ class NetworkConfig(object): out['provider:segmentation_id'] = self.segmentation_id if self.external: out['router:external'] = self.external + if self.mtu: + out['mtu'] = self.mtu return {'network': out} @@ -444,7 +449,6 @@ class PortConfig(object): TODO - expand automated testing to exercise all parameters :param neutron: the Neutron client - :param keystone: the Keystone client :param os_creds: the OpenStack credentials :return: the dictionary object """ @@ -457,8 +461,11 @@ class PortConfig(object): project_name = project_name try: network = neutron_utils.get_network( - neutron, keystone, network_name=self.network_name, - project_name=project_name) + neutron, keystone, network_name=self.network_name) + if network and not (network.shared or network.external): + network = neutron_utils.get_network( + neutron, keystone, network_name=self.network_name, + project_name=project_name) finally: if session: keystone_utils.close_session(session) diff --git a/snaps/config/project.py b/snaps/config/project.py index 79c316b..d6d175f 100644 --- a/snaps/config/project.py +++ b/snaps/config/project.py @@ -37,7 +37,7 @@ class ProjectConfig(object): self.name = kwargs.get('name') self.domain_name = kwargs.get( - 'domain', kwargs.get('domain', 'Default')) + 'domain_name', kwargs.get('domain', 'Default')) self.description = kwargs.get('description') if kwargs.get('enabled') is not None: diff --git a/snaps/config/stack.py b/snaps/config/stack.py index 4d5db29..3fc820e 100644 --- a/snaps/config/stack.py +++ b/snaps/config/stack.py @@ -15,9 +15,12 @@ STACK_DELETE_TIMEOUT = 1200 STACK_COMPLETE_TIMEOUT = 1200 +STACK_UPDATE_TIMEOUT = 1200 POLL_INTERVAL = 3 STATUS_CREATE_FAILED = 'CREATE_FAILED' STATUS_CREATE_COMPLETE = 'CREATE_COMPLETE' +STATUS_UPDATE_FAILED = 'UPDATE_FAILED' +STATUS_UPDATE_COMPLETE = 'UPDATE_COMPLETE' STATUS_DELETE_COMPLETE = 'DELETE_COMPLETE' STATUS_DELETE_FAILED = 'DELETE_FAILED' diff --git a/snaps/config/tests/network_tests.py b/snaps/config/tests/network_tests.py index 62ce067..cbc71af 100644 --- a/snaps/config/tests/network_tests.py +++ b/snaps/config/tests/network_tests.py @@ -42,6 +42,7 @@ class NetworkConfigUnitTests(unittest.TestCase): self.assertIsNone(settings.network_type) self.assertIsNone(settings.segmentation_id) self.assertEqual(0, len(settings.subnet_settings)) + self.assertIsNone(settings.mtu) def test_config_with_name_only(self): settings = NetworkConfig(**{'name': 'foo'}) @@ -53,13 +54,14 @@ class NetworkConfigUnitTests(unittest.TestCase): self.assertIsNone(settings.network_type) self.assertIsNone(settings.segmentation_id) self.assertEqual(0, len(settings.subnet_settings)) + self.assertIsNone(settings.mtu) def test_all(self): sub_settings = SubnetConfig(name='foo-subnet', cidr='10.0.0.0/24') settings = NetworkConfig( name='foo', admin_state_up=False, shared=True, project_name='bar', external=True, network_type='vlan', physical_network='phy', - segmentation_id=2366, subnet_settings=[sub_settings]) + segmentation_id=2366, subnet_settings=[sub_settings], mtu=999) self.assertEqual('foo', settings.name) self.assertFalse(settings.admin_state_up) self.assertTrue(settings.shared) @@ -70,6 +72,7 @@ class NetworkConfigUnitTests(unittest.TestCase): self.assertEqual(2366, settings.segmentation_id) self.assertEqual(1, len(settings.subnet_settings)) self.assertEqual('foo-subnet', settings.subnet_settings[0].name) + self.assertEqual(999, settings.mtu) def test_config_all(self): settings = NetworkConfig( @@ -79,7 +82,8 @@ class NetworkConfigUnitTests(unittest.TestCase): 'segmentation_id': 2366, 'subnets': [{'subnet': {'name': 'foo-subnet', - 'cidr': '10.0.0.0/24'}}]}) + 'cidr': '10.0.0.0/24'}}], + 'mtu': 999}) self.assertEqual('foo', settings.name) self.assertFalse(settings.admin_state_up) self.assertTrue(settings.shared) @@ -90,6 +94,7 @@ class NetworkConfigUnitTests(unittest.TestCase): self.assertEqual(2366, settings.segmentation_id) self.assertEqual(1, len(settings.subnet_settings)) self.assertEqual('foo-subnet', settings.subnet_settings[0].name) + self.assertEqual(999, settings.mtu) class SubnetConfigUnitTests(unittest.TestCase): diff --git a/snaps/domain/network.py b/snaps/domain/network.py index a028e2b..3d5e4af 100644 --- a/snaps/domain/network.py +++ b/snaps/domain/network.py @@ -39,6 +39,7 @@ class Network: self.external = kwargs.get('router:external', kwargs.get('external')) self.type = kwargs.get('provider:network_type', kwargs.get('type')) self.subnets = kwargs.get('subnets', list()) + self.mtu = kwargs.get('mtu') def __eq__(self, other): return (self.name == other.name and self.id == other.id and @@ -46,7 +47,8 @@ class Network: self.admin_state_up == other.admin_state_up and self.shared == other.shared and self.external == other.external and - self.subnets == other.subnets) + self.subnets == other.subnets and + self.mtu == other.mtu) class Subnet: @@ -186,8 +188,7 @@ class Router: self.port_subnets = kwargs.get('port_subnets') if (kwargs.get('external_gateway_info') and - isinstance(kwargs.get('external_gateway_info'), dict) and - kwargs.get('external_gateway_info').get('external_fixed_ips')): + isinstance(kwargs.get('external_gateway_info'), dict)): gateway_info = kwargs.get('external_gateway_info') self.external_network_id = gateway_info.get('network_id') diff --git a/snaps/domain/test/network_tests.py b/snaps/domain/test/network_tests.py index 5f70c3f..2c4c841 100644 --- a/snaps/domain/test/network_tests.py +++ b/snaps/domain/test/network_tests.py @@ -31,7 +31,8 @@ class NetworkObjectTests(unittest.TestCase): network = Network( **{'name': 'foo', 'id': 'bar', 'project_id': 'proj1', 'provider:network_type': 'flat', 'admin_state_up': False, - 'shared': True, 'router:external': False, 'subnets': [subnet]}) + 'shared': True, 'router:external': False, 'subnets': [subnet], + 'mtu': 999}) self.assertEqual('foo', network.name) self.assertEqual('bar', network.id) self.assertEqual('proj1', network.project_id) @@ -40,6 +41,7 @@ class NetworkObjectTests(unittest.TestCase): self.assertFalse(network.external) self.assertTrue(network.shared) self.assertEqual([subnet], network.subnets) + self.assertEqual(999, network.mtu) def test_construction_kwargs_2(self): subnet = Subnet( diff --git a/snaps/file_utils.py b/snaps/file_utils.py index a421dd3..284ae15 100644 --- a/snaps/file_utils.py +++ b/snaps/file_utils.py @@ -12,6 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import ssl + import os import logging @@ -168,7 +170,8 @@ def __get_url_response(url): proxy_handler = urllib.ProxyHandler({}) opener = urllib.build_opener(proxy_handler) urllib.install_opener(opener) - return urllib.urlopen(url) + context = ssl._create_unverified_context() + return urllib.urlopen(url, context=context) def read_yaml(config_file_path): @@ -180,7 +183,7 @@ def read_yaml(config_file_path): logger.debug('Attempting to load configuration file - ' + config_file_path) config_file = None try: - with open(config_file_path) as config_file: + with open(config_file_path, 'r') as config_file: config = yaml.safe_load(config_file) logger.info('Loaded configuration') return config @@ -190,6 +193,20 @@ def read_yaml(config_file_path): config_file.close() +def persist_dict_to_yaml(the_dict, file_name): + """ + Creates a YAML file from a dict + :param the_dict: the dictionary to store + :param conf_dir: the directory used to store the config file + :return: the file object + """ + logger.info('Persisting %s to [%s]', the_dict, file_name) + file_path = os.path.expanduser(file_name) + yaml_from_dict = yaml.dump( + the_dict, default_flow_style=False, default_style='') + return save_string_to_file(yaml_from_dict, file_path) + + def read_os_env_file(os_env_filename): """ Reads the OS environment source file and returns a map of each key/value diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py index 16bd0ce..b158a25 100644 --- a/snaps/openstack/create_instance.py +++ b/snaps/openstack/create_instance.py @@ -474,9 +474,12 @@ class OpenStackVmInstance(OpenStackComputeObject): playbook :param fip_name: the name of the floating IP to use for applying the playbook (default - will take the first) - :return: the return value from ansible """ - return ansible_utils.apply_playbook( + from warnings import warn + warn('This method will be removed in a subsequent release', + DeprecationWarning) + + ansible_utils.apply_playbook( pb_file_loc, [self.get_floating_ip(fip_name=fip_name).ip], self.get_image_user(), ssh_priv_key_file_path=self.keypair_settings.private_filepath, diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py index 441b21a..3269bbd 100644 --- a/snaps/openstack/create_router.py +++ b/snaps/openstack/create_router.py @@ -14,8 +14,6 @@ # limitations under the License. import logging -import six - from neutronclient.common.exceptions import NotFound, Unauthorized from snaps.config.router import RouterConfig @@ -113,7 +111,7 @@ class OpenStackRouter(OpenStackNetworkObject): self.__internal_router_interface = router_intf else: raise RouterCreationError( - 'Subnet not found with name ' + internal_subnet.name) + 'Subnet not found with name {}'.format(sub_config)) for port_setting in self.router_settings.port_settings: port = neutron_utils.get_port( @@ -151,10 +149,6 @@ class OpenStackRouter(OpenStackNetworkObject): :param sub_config: :return: """ - if isinstance(sub_config, six.text_type): - return neutron_utils.get_subnet_by_name( - self._neutron, self._keystone, - subnet_name=sub_config) if isinstance(sub_config, dict): sub_dict = sub_config['subnet'] network = neutron_utils.get_network( @@ -165,6 +159,11 @@ class OpenStackRouter(OpenStackNetworkObject): return neutron_utils.get_subnet( self._neutron, network, subnet_name=sub_dict['subnet_name']) + else: + return neutron_utils.get_subnet_by_name( + self._neutron, self._keystone, + subnet_name=sub_config, + project_name=self._os_creds.project_name) def clean(self): """ diff --git a/snaps/openstack/create_stack.py b/snaps/openstack/create_stack.py index 43ac307..71e5d0a 100644 --- a/snaps/openstack/create_stack.py +++ b/snaps/openstack/create_stack.py @@ -23,16 +23,17 @@ from snaps.config.stack import StackConfig from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_instance import OpenStackVmInstance from snaps.openstack.create_keypairs import OpenStackKeypair -from snaps.openstack.create_security_group import OpenStackSecurityGroup +from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_router import OpenStackRouter +from snaps.openstack.create_security_group import OpenStackSecurityGroup from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.create_volume_type import OpenStackVolumeType from snaps.openstack.openstack_creator import OpenStackCloudObject from snaps.openstack.utils import ( nova_utils, settings_utils, glance_utils, cinder_utils) - -from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.utils import heat_utils, neutron_utils +from snaps.thread_utils import worker_pool + __author__ = 'spisarski' @@ -101,7 +102,7 @@ class OpenStackHeatStack(OpenStackCloudObject, object): logger.info('Found stack with name - ' + self.stack_settings.name) return self.__stack - def create(self): + def create(self, block=False): """ Creates the heat stack in OpenStack if it does not already exist and returns the domain Stack object @@ -117,7 +118,7 @@ class OpenStackHeatStack(OpenStackCloudObject, object): self.stack_settings) logger.info( 'Created stack with name - %s', self.stack_settings.name) - if self.__stack and self.stack_complete(block=True): + if self.__stack and self.stack_complete(block=block): logger.info('Stack is now active with name - %s', self.stack_settings.name) return self.__stack @@ -127,6 +128,28 @@ class OpenStackHeatStack(OpenStackCloudObject, object): logger.error('ERROR: STACK CREATION FAILED: %s', status) raise StackCreationError('Failure while creating stack') + def update(self, env_vals, block=False): + """ + Updates the heat stack in OpenStack + :param: env_vals - the values to update + :return: The Stack domain object or None + """ + if self.__stack: + logger.info('Updating stack - %s', self.__stack.name) + heat_utils.update_stack(self.__heat_cli, self.__stack, env_vals) + if self.stack_updated(block=block): + logger.info('Stack %s is now updated with params: %s', + self.__stack.name, env_vals) + self.stack_settings.env_values = env_vals + self.__stack = heat_utils.get_stack_by_id( + self.__heat_cli, self.__stack.id) + return self.__stack + else: + status = heat_utils.get_stack_status_reason(self.__heat_cli, + self.__stack.id) + logger.error('ERROR: STACK UPDATE FAILED: %s', status) + raise StackUpdateError('Failure while updating stack') + def clean(self): """ Cleanse environment of all artifacts @@ -219,6 +242,22 @@ class OpenStackHeatStack(OpenStackCloudObject, object): snaps.config.stack.STATUS_CREATE_COMPLETE, block, timeout, poll_interval, snaps.config.stack.STATUS_CREATE_FAILED) + def stack_updated(self, block=False, + timeout=snaps.config.stack.STACK_UPDATE_TIMEOUT, + poll_interval=snaps.config.stack.POLL_INTERVAL): + """ + Returns true when the stack status returns the value of + expected_status_code + :param block: When true, thread will block until active or timeout + value in seconds has been exceeded (False) + :param timeout: The timeout value + :param poll_interval: The polling interval in seconds + :return: T/F + """ + return self._stack_status_check( + snaps.config.stack.STATUS_UPDATE_COMPLETE, block, timeout, + poll_interval, snaps.config.stack.STATUS_UPDATE_FAILED) + def stack_deleted(self, block=False, timeout=snaps.config.stack.STACK_DELETE_TIMEOUT, poll_interval=snaps.config.stack.POLL_INTERVAL): @@ -295,6 +334,23 @@ class OpenStackHeatStack(OpenStackCloudObject, object): return out + def __create_vm_inst(self, heat_keypair_option, stack_server): + + vm_inst_settings = settings_utils.create_vm_inst_config( + self.__nova, self._keystone, self.__neutron, stack_server, + self._os_creds.project_name) + image_settings = settings_utils.determine_image_config( + self.__glance, stack_server, self.image_settings) + keypair_settings = settings_utils.determine_keypair_config( + self.__heat_cli, self.__stack, stack_server, + keypair_settings=self.keypair_settings, + priv_key_key=heat_keypair_option) + vm_inst_creator = OpenStackVmInstance( + self._os_creds, vm_inst_settings, image_settings, + keypair_settings) + vm_inst_creator.initialize() + return vm_inst_creator + def get_vm_inst_creators(self, heat_keypair_option=None): """ Returns a list of VM Instance creator objects as configured by the heat @@ -308,21 +364,16 @@ class OpenStackHeatStack(OpenStackCloudObject, object): self.__heat_cli, self.__nova, self.__neutron, self._keystone, self.__stack, self._os_creds.project_name) + workers = [] for stack_server in stack_servers: - vm_inst_settings = settings_utils.create_vm_inst_config( - self.__nova, self._keystone, self.__neutron, stack_server, - self._os_creds.project_name) - image_settings = settings_utils.determine_image_config( - self.__glance, stack_server, self.image_settings) - keypair_settings = settings_utils.determine_keypair_config( - self.__heat_cli, self.__stack, stack_server, - keypair_settings=self.keypair_settings, - priv_key_key=heat_keypair_option) - vm_inst_creator = OpenStackVmInstance( - self._os_creds, vm_inst_settings, image_settings, - keypair_settings) - out.append(vm_inst_creator) - vm_inst_creator.initialize() + worker = worker_pool().apply_async( + self.__create_vm_inst, + (heat_keypair_option, + stack_server)) + workers.append(worker) + + for worker in workers: + out.append(worker.get()) return out @@ -533,6 +584,11 @@ class StackCreationError(Exception): Exception to be thrown when an stack cannot be created """ +class StackUpdateError(Exception): + """ + Exception to be thrown when an stack update failed + """ + class StackError(Exception): """ diff --git a/snaps/openstack/openstack_creator.py b/snaps/openstack/openstack_creator.py index 9bd099b..6eeac37 100644 --- a/snaps/openstack/openstack_creator.py +++ b/snaps/openstack/openstack_creator.py @@ -38,6 +38,9 @@ class OpenStackCloudObject(CloudObject): self._keystone = keystone_utils.keystone_client( self._os_creds, session=self._os_session) + def get_os_creds(self): + return self._os_creds + def create(self): raise NotImplementedError('Do not override abstract method') diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py index 7cb5650..11ef8ff 100644 --- a/snaps/openstack/os_credentials.py +++ b/snaps/openstack/os_credentials.py @@ -63,7 +63,7 @@ class OSCreds: self.project_name = kwargs.get('project_name') if kwargs.get('identity_api_version') is None: - self.identity_api_version = keystone_utils.V2_VERSION_NUM + self.identity_api_version = keystone_utils.V3_VERSION_NUM else: self.identity_api_version = float(kwargs['identity_api_version']) @@ -171,6 +171,45 @@ class OSCreds: return new_url + def to_dict(self): + """Converts object to a dict that can be used to construct another""" + return {'username': self.username, + 'password': self.password, + 'auth_url': self.auth_url, + 'project_name': self.project_name, + 'identity_api_version': self.identity_api_version, + 'image_api_version': self.image_api_version, + 'network_api_version': self.network_api_version, + 'compute_api_version': self.compute_api_version, + 'heat_api_version': self.heat_api_version, + 'user_domain_id': self.user_domain_id, + 'user_domain_name': self.user_domain_name, + 'project_domain_id': self.project_domain_id, + 'project_domain_name': self.project_domain_name, + 'interface': self.interface, + 'region_name': self.region_name, + 'proxy_settings': self.proxy_settings, + 'cacert': self.cacert} + + def __eq__(self, other): + return (self.username == other.username and + self.password == other.password and + self.auth_url == other.auth_url and + self.project_name == other.project_name and + float(self.identity_api_version) == float(other.identity_api_version) and + float(self.image_api_version) == float(other.image_api_version) and + float(self.network_api_version) == float(other.network_api_version) and + float(self.compute_api_version) == float(other.compute_api_version) and + float(self.heat_api_version) == float(other.heat_api_version) and + self.user_domain_id == other.user_domain_id and + self.user_domain_name == other.user_domain_name and + self.project_domain_id == other.project_domain_id and + self.project_domain_name == other.project_domain_name and + self.interface == other.interface and + self.region_name == other.region_name and + self.proxy_settings == other.proxy_settings and + self.cacert == other.cacert) + def __str__(self): """Converts object to a string""" return ('OSCreds - username=' + str(self.username) + diff --git a/snaps/openstack/tests/cluster_template_tests.py b/snaps/openstack/tests/cluster_template_tests.py index b08f260..eda790d 100644 --- a/snaps/openstack/tests/cluster_template_tests.py +++ b/snaps/openstack/tests/cluster_template_tests.py @@ -69,9 +69,10 @@ class CreateClusterTemplateTests(OSIntegrationTestCase): self.image_creator = OpenStackImage(self.os_creds, os_image_settings) - self.flavor_creator = OpenStackFlavor( - self.os_creds, FlavorConfig( - name=self.guid + '-flavor', ram=512, disk=10, vcpus=1)) + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor', ram=512, disk=10, + vcpus=1, metadata=self.flavor_metadata) + self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_config) keypair_priv_filepath = 'tmp/' + self.guid keypair_pub_filepath = keypair_priv_filepath + '.pub' diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index 192be86..696ca2d 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -142,9 +142,9 @@ class OSCredsUnitTests(unittest.TestCase): project_name='hello') self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) @@ -165,9 +165,9 @@ class OSCredsUnitTests(unittest.TestCase): 'project_name': 'hello'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) @@ -243,9 +243,9 @@ class OSCredsUnitTests(unittest.TestCase): project_name='hello', proxy_settings=proxy_settings) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) @@ -262,6 +262,11 @@ class OSCredsUnitTests(unittest.TestCase): self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) self.assertIsNone(os_creds.region_name) + creds_dict = os_creds.to_dict() + creds_from_dict = OSCreds(**creds_dict) + + self.assertEqual(os_creds, creds_from_dict) + def test_proxy_settings_obj_kwargs(self): proxy_settings = ProxySettings(host='foo', port=1234) os_creds = OSCreds( @@ -273,9 +278,9 @@ class OSCredsUnitTests(unittest.TestCase): 'project_domain_name': 'domain4'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) @@ -300,9 +305,9 @@ class OSCredsUnitTests(unittest.TestCase): project_domain_id='domain3', project_domain_name='domain4') self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) @@ -326,9 +331,9 @@ class OSCredsUnitTests(unittest.TestCase): 'region_name': 'test_region'}) self.assertEqual('foo', os_creds.username) self.assertEqual('bar', os_creds.password) - self.assertEqual('http://foo.bar:5000/v2.0', os_creds.auth_url) + self.assertEqual('http://foo.bar:5000/v3', os_creds.auth_url) self.assertEqual('hello', os_creds.project_name) - self.assertEqual(2, os_creds.identity_api_version) + self.assertEqual(3, 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) diff --git a/snaps/openstack/tests/conf/os_env.yaml.template b/snaps/openstack/tests/conf/os_env.yaml.template index 36e3cfd..53d500f 100644 --- a/snaps/openstack/tests/conf/os_env.yaml.template +++ b/snaps/openstack/tests/conf/os_env.yaml.template @@ -14,4 +14,7 @@ #os_auth_url: http://<host>:<port>/ #project_name: admin #identity_api_version: 3 -#ext_net: <external network name>
\ No newline at end of file +#ext_net: <external network name> + +flavor_metadata: + hw:mem_page_size: large diff --git a/snaps/openstack/tests/create_flavor_tests.py b/snaps/openstack/tests/create_flavor_tests.py index 453509b..a69de40 100644 --- a/snaps/openstack/tests/create_flavor_tests.py +++ b/snaps/openstack/tests/create_flavor_tests.py @@ -20,6 +20,7 @@ from snaps.openstack import create_flavor from snaps.openstack.create_flavor import OpenStackFlavor, FlavorSettings from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import nova_utils +from snaps.openstack.tests import openstack_tests __author__ = 'spisarski' @@ -364,10 +365,12 @@ class CreateFlavorTests(OSComponentTestCase): raise any exceptions. """ # Create Flavor - flavor_settings = FlavorConfig( + if self.flavor_metadata: + self.flavor_metadata.update(create_flavor.MEM_PAGE_SIZE_ANY) + flavor_settings = openstack_tests.get_flavor_config( name=self.flavor_name, ram=1, disk=1, vcpus=1, ephemeral=2, swap=3, rxtx_factor=2.2, is_public=False, - metadata=create_flavor.MEM_PAGE_SIZE_ANY) + metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_settings) flavor = self.flavor_creator.create() self.assertTrue(validate_flavor(self.nova, flavor_settings, flavor)) diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 0ef155b..17831b3 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -24,7 +24,6 @@ from neutronclient.common.exceptions import ( InvalidIpForSubnetClient, BadRequest) from snaps import file_utils -from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig from snaps.config.network import PortConfig, NetworkConfig, SubnetConfig @@ -45,6 +44,7 @@ from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import OpenStackSecurityGroup from snaps.openstack.create_volume import OpenStackVolume +from snaps.openstack.os_credentials import OSCreds from snaps.openstack.tests import openstack_tests, validation_utils from snaps.openstack.tests.os_source_file_test import ( OSIntegrationTestCase, OSComponentTestCase) @@ -335,10 +335,11 @@ class SimpleHealthCheck(OSIntegrationTestCase): if (self.flavor_metadata and self.flavor_metadata.get('hw:mem_page_size') == 'large'): self.flavor_ram = 1024 + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=self.flavor_ram, disk=10, + vcpus=1, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=self.flavor_ram, - disk=10, vcpus=1, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() except Exception as e: self.tearDown() @@ -437,10 +438,11 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): self.image_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=self.guid + '-flavor-name', ram=256, disk=10, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.network_creator = None except Exception as e: @@ -615,10 +617,11 @@ class CreateInstanceExternalNetTests(OSIntegrationTestCase): self.image_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=256, disk=10, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.port_settings = PortConfig( @@ -692,6 +695,7 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): Instantiates the CreateImage object that is responsible for downloading and creating an OS image file within OpenStack """ + self.proj_users = ['admin'] super(self.__class__, self).__start__() self.nova = nova_utils.nova_client(self.os_creds, self.os_session) @@ -737,10 +741,11 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): self.router_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=256, disk=10, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.keypair_creator = OpenStackKeypair( @@ -1052,10 +1057,36 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): self.assertTrue(inst_creator.vm_active(block=True)) + vm_os_creds = OSCreds( + auth_url=self.admin_os_creds.auth_url, + username=self.admin_os_creds.username, + password=self.admin_os_creds.password, + project_name=self.os_creds.project_name, + identity_api_version=self.os_creds.identity_api_version) derived_inst_creator = create_instance.generate_creator( - self.os_creds, vm_inst, self.image_creator.image_settings, + vm_os_creds, vm_inst, self.image_creator.image_settings, self.os_creds.project_name, self.keypair_creator.keypair_settings) + # Tests to ensure that a instance can be returned with an invalid + # image config object and admin credentials (when the 'admin' user has + # been added to the project) as this should not matter unless one + # needs to access the machine via ssh and its floating IP + + # Invalid ImageConfig + derived_foo_image_creator = create_instance.generate_creator( + vm_os_creds, vm_inst, ImageConfig( + name='foo', image_user='bar', format='qcow2', + image_file='foo/bar'), + vm_os_creds.project_name) + self.assertIsNotNone(derived_foo_image_creator) + self.assertTrue(derived_foo_image_creator.vm_active()) + + # None ImageConfig + derived_none_image_creator = create_instance.generate_creator( + vm_os_creds, vm_inst, None, vm_os_creds.project_name) + self.assertIsNotNone(derived_none_image_creator) + self.assertTrue(derived_none_image_creator.vm_active()) + derived_inst_creator.add_floating_ip(FloatingIpConfig( name=self.floating_ip_name, port_name=self.port_1_name, router_name=self.pub_net_config.router_settings.name)) @@ -1146,11 +1177,11 @@ class CreateInstanceIPv6NetworkTests(OSIntegrationTestCase): self.os_creds, os_image_settings) self.image_creator.create() + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig( - name=self.guid + '-flavor-name', ram=256, disk=10, vcpus=2, - metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.keypair_creator = OpenStackKeypair( @@ -1333,6 +1364,7 @@ class CreateInstanceIPv6NetworkTests(OSIntegrationTestCase): keypair_settings=self.keypair_creator.keypair_settings) self.inst_creator.create(block=True) + self.inst_creator.cloud_init_complete(block=True) ssh_client = self.inst_creator.ssh_client() self.assertIsNotNone(ssh_client) @@ -1385,10 +1417,11 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase): self.network_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=self.guid + '-flavor-name', ram=256, disk=10, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() except Exception as e: self.tearDown() @@ -1422,6 +1455,14 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase): 'Unexpected exception cleaning network with message - %s', e) + if self.network_creator2: + try: + self.network_creator2.clean() + except Exception as e: + logger.error( + 'Unexpected exception cleaning network with message - %s', + e) + if self.image_creator and not self.image_creator.image_settings.exists: try: self.image_creator.clean() @@ -1760,10 +1801,11 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): self.network_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=512, disk=1, + vcpus=1, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=512, disk=1, - vcpus=1, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() # Create Image @@ -1909,11 +1951,11 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase): self.network_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=self.guid + '-flavor-name', ram=256, - disk=10, vcpus=2, - metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.port_settings = PortConfig( @@ -2246,10 +2288,11 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): self.image_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=256, disk=10, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() # Create Network @@ -2368,11 +2411,11 @@ class CreateInstanceMockOfflineTests(OSComponentTestCase): self.network_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.os_creds, - FlavorConfig( - name=self.guid + '-flavor-name', ram=256, disk=10, - vcpus=1)) + self.os_creds, flavor_config) self.flavor_creator.create() except Exception as e: self.tearDown() @@ -2910,11 +2953,11 @@ class CreateInstanceTwoNetTests(OSIntegrationTestCase): self.os_creds, router_settings) self.router_creator.create() + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=512, disk=10, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=self.guid + '-flavor-name', ram=512, - disk=10, vcpus=2, - metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.sec_grp_name = self.guid + '-sec-grp' @@ -3099,10 +3142,11 @@ class CreateInstanceVolumeTests(OSIntegrationTestCase): self.image_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=256, disk=1, + vcpus=2, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=256, disk=1, - vcpus=2, metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() # Create Network diff --git a/snaps/openstack/tests/create_network_tests.py b/snaps/openstack/tests/create_network_tests.py index 5ba5cef..26c57bd 100644 --- a/snaps/openstack/tests/create_network_tests.py +++ b/snaps/openstack/tests/create_network_tests.py @@ -366,8 +366,10 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) self.net_config = openstack_tests.get_pub_net_config( project_name=self.os_creds.project_name, - net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', - router_name=guid + '-pub-router', external_net=self.ext_net_name, + net_name="{}-{}".format(guid, 'pub-net'), mtu=999, + subnet_name="{}-{}".format(guid, 'pub-subnet'), + router_name="{}-{}".format(guid, 'pub-router'), + external_net=self.ext_net_name, netconf_override=self.netconf_override) self.neutron = neutron_utils.neutron_client( @@ -402,7 +404,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) # Validate subnets self.assertTrue(neutron_utils_tests.validate_subnet( @@ -423,7 +425,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) neutron_utils.delete_network( self.neutron, self.net_creator.get_network()) @@ -453,7 +455,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) # Validate subnets self.assertTrue(neutron_utils_tests.validate_subnet( @@ -638,11 +640,10 @@ class CreateNetworkGatewayTests(OSIntegrationTestCase): self.os_creds, net_config) out_net = self.net_creator.create() - # Validate network was created - self.assertTrue(neutron_utils_tests.validate_network( - self.neutron, self.keystone, - self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.assertIsNotNone(out_net) + + get_net = neutron_utils.get_network_by_id(self.neutron, out_net.id) + self.assertIsNotNone(get_net) # Validate subnets self.assertTrue(neutron_utils_tests.validate_subnet( diff --git a/snaps/openstack/tests/create_router_tests.py b/snaps/openstack/tests/create_router_tests.py index 30cf31e..a305cf8 100644 --- a/snaps/openstack/tests/create_router_tests.py +++ b/snaps/openstack/tests/create_router_tests.py @@ -21,7 +21,8 @@ from snaps.config.security_group import SecurityGroupConfig from snaps.openstack import create_network from snaps.openstack import create_router from snaps.openstack.create_network import OpenStackNetwork -from snaps.openstack.create_router import RouterSettings, OpenStackRouter +from snaps.openstack.create_router import ( + RouterSettings, OpenStackRouter, RouterCreationError) from snaps.openstack.create_security_group import OpenStackSecurityGroup from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase from snaps.openstack.utils import neutron_utils, settings_utils, keystone_utils @@ -30,6 +31,7 @@ __author__ = 'mmakati' cidr1 = '10.200.201.0/24' cidr2 = '10.200.202.0/24' +cidr3 = '10.200.203.0/24' static_gateway_ip1 = '10.200.201.1' static_gateway_ip2 = '10.200.202.1' @@ -239,6 +241,53 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): # Should not raise an exception self.router_creator.clean() + def test_create_with_internal_sub(self): + """ + Test internal_subnets works. + """ + network_settings1 = NetworkConfig( + name=self.guid + '-pub-net1', + subnet_settings=[ + create_network.SubnetConfig( + cidr=cidr1, name=self.guid + '-pub-subnet1', + gateway_ip=static_gateway_ip1)]) + self.network_creator1 = OpenStackNetwork(self.os_creds, + network_settings1) + + self.network_creator1.create() + self.router_settings = RouterConfig( + name=self.guid + '-pub-router', external_gateway=self.ext_net_name, + internal_subnets=[network_settings1.subnet_settings[0].name]) + + self.router_creator = create_router.OpenStackRouter( + self.os_creds, self.router_settings) + created_router = self.router_creator.create() + self.assertIsNotNone(created_router) + + def test_create_with_invalid_internal_sub(self): + """ + Test adding an internal subnet owned by admin which should fail. + """ + network_settings1 = NetworkConfig( + name=self.guid + '-pub-net1', + subnet_settings=[ + create_network.SubnetConfig( + cidr=cidr1, name=self.guid + '-pub-subnet1', + gateway_ip=static_gateway_ip1)]) + self.network_creator1 = OpenStackNetwork(self.admin_os_creds, + network_settings1) + + self.network_creator1.create() + self.router_settings = RouterConfig( + name=self.guid + '-pub-router', external_gateway=self.ext_net_name, + internal_subnets=[network_settings1.subnet_settings[0].name]) + + self.router_creator = create_router.OpenStackRouter( + self.os_creds, self.router_settings) + + with self.assertRaises(RouterCreationError): + self.router_creator.create() + def test_create_router_admin_state_false(self): """ Test creation of a basic router with admin state down. @@ -413,13 +462,18 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): self.assertIsNotNone(ext_net) self.assertIsNotNone(router.port_subnets) + + id_found = False for port, subnets in router.port_subnets: self.assertIsNotNone(subnets) self.assertIsNotNone(port) - self.assertEqual(ext_net.id, port.network_id) - for subnet in subnets: - self.assertIsNotNone(subnet) - self.assertEqual(ext_net.id, subnet.network_id) + + if ext_net.id == port.network_id: + id_found = True + for subnet in subnets: + self.assertIsNotNone(subnet) + self.assertEqual(ext_net.id, subnet.network_id) + self.assertTrue(id_found) def check_router_recreation(self, router, orig_settings): """ @@ -711,3 +765,109 @@ class CreateRouterSecurityGroupTests(OSIntegrationTestCase): self.router_creator = create_router.OpenStackRouter( self.os_creds, router_settings) self.router_creator.create() + + +class CreateRouterSharedNetworksTests(OSIntegrationTestCase): + """ + Class for testing routers external and/or shared networks + """ + + def setUp(self): + """ + Initializes objects used for router testing + """ + super(self.__class__, self).__start__() + + self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) + self.router_creator = None + + ext_network_settings = NetworkConfig( + name=self.guid + '-ext-net', + external=True, + subnet_settings=[ + create_network.SubnetConfig( + cidr=cidr1, name=self.guid + '-ext-subnet1')]) + self.ext_network_creator = OpenStackNetwork( + self.admin_os_creds, ext_network_settings) + self.ext_network_creator.create() + + shared_network_settings = NetworkConfig( + name=self.guid + '-shared-net', + shared=True, + subnet_settings=[ + create_network.SubnetConfig( + cidr=cidr2, name=self.guid + '-shared-subnet1')]) + self.shared_network_creator = OpenStackNetwork( + self.admin_os_creds, shared_network_settings) + self.shared_network_creator.create() + + overlay_network_settings = NetworkConfig( + name=self.guid + '-overlay-net', + subnet_settings=[ + create_network.SubnetConfig( + cidr=cidr3, name=self.guid + '-overlay-subnet1')]) + self.overlay_network_creator = OpenStackNetwork( + self.os_creds, overlay_network_settings) + self.overlay_network_creator.create() + + self.neutron = neutron_utils.neutron_client( + self.os_creds, self.os_session) + + def tearDown(self): + """ + Cleans the remote OpenStack objects used for router testing + """ + if self.router_creator: + self.router_creator.clean() + + if self.overlay_network_creator: + self.overlay_network_creator.clean() + + if self.shared_network_creator: + self.shared_network_creator.clean() + + if self.ext_network_creator: + self.ext_network_creator.clean() + + super(self.__class__, self).__clean__() + + def test_create_router_external(self): + """ + Test creation of a router with a custom external network created by + admin. + """ + router_settings = RouterConfig( + name=self.guid + '-pub-router', + external_gateway=self.ext_network_creator.get_network().name) + self.router_creator = create_router.OpenStackRouter( + self.os_creds, router_settings) + self.router_creator.create() + + def test_create_router_port_external(self): + """ + Test creation of a router with a port to an custom external network + created by admin. + """ + router_settings = RouterConfig( + name=self.guid + '-pub-router', + network_name=self.ext_network_creator.get_network().name) + self.router_creator = create_router.OpenStackRouter( + self.os_creds, router_settings) + self.router_creator.create() + + def test_create_router_port_shared(self): + """ + Test creation of a router with a port to an custom shared network + created by admin. + """ + port_settings = [ + create_network.PortConfig( + name=self.guid + '-port1', + network_name=self.shared_network_creator.get_network().name)] + + router_settings = RouterConfig( + name=self.guid + '-pub-router', + port_settings=port_settings) + self.router_creator = create_router.OpenStackRouter( + self.os_creds, router_settings) + self.router_creator.create() diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py index 17acede..7da5bc7 100644 --- a/snaps/openstack/tests/create_stack_tests.py +++ b/snaps/openstack/tests/create_stack_tests.py @@ -22,7 +22,8 @@ import snaps from snaps import file_utils from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig -from snaps.config.stack import StackConfigError, StackConfig +from snaps.config.stack import (StackConfigError, StackConfig, + STATUS_UPDATE_COMPLETE) from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_image import OpenStackImage @@ -150,10 +151,11 @@ class CreateStackSuccessTests(OSIntegrationTestCase): self.image_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor-name', ram=256, disk=10, + vcpus=1, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig( - name=self.guid + '-flavor-name', ram=256, disk=10, vcpus=1)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() self.network_name = self.guid + '-net' @@ -207,7 +209,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli, @@ -238,7 +240,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) with self.assertRaises(StackCreationError): - self.stack_creator.create() + self.stack_creator.create(block=True) def test_create_stack_template_dict(self): """ @@ -255,7 +257,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli, @@ -279,7 +281,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli, @@ -323,7 +325,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack1 = self.stack_creator.create() + created_stack1 = self.stack_creator.create(block=True) retrieved_stack = heat_utils.get_stack_by_id(self.heat_cli, created_stack1.id) @@ -334,7 +336,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): # Should be retrieving the instance data stack_creator2 = OpenStackHeatStack(self.os_creds, stack_settings) - stack2 = stack_creator2.create() + stack2 = stack_creator2.create(block=True) self.assertEqual(created_stack1.id, stack2.id) def test_retrieve_network_creators(self): @@ -348,7 +350,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) net_creators = self.stack_creator.get_network_creators() @@ -389,7 +391,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) vm_inst_creators = self.stack_creator.get_vm_inst_creators() @@ -446,6 +448,7 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase): 'image2_name': self.image_creator.image_settings.name, 'flavor1_name': self.flavor1_name, 'flavor2_name': self.flavor2_name, + 'flavor_extra_specs': self.flavor_metadata, 'net_name': self.network_name, 'subnet_name': self.subnet_name, 'inst1_name': self.vm_inst1_name, @@ -501,7 +504,7 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase): self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings, [self.image_creator.image_settings]) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) self.vm_inst_creators = self.stack_creator.get_vm_inst_creators( @@ -530,7 +533,7 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase): self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings, [self.image_creator.image_settings]) - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) derived_stack = create_stack.generate_creator( @@ -568,6 +571,114 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): self.image_creator = OpenStackImage( self.os_creds, openstack_tests.cirros_image_settings( + name="{}-{}".format(self.guid, 'image'), + image_metadata=self.image_metadata)) + self.image_creator.create() + + flavor_config = openstack_tests.get_flavor_config( + name="{}-{}".format(self.guid, 'flavor-name'), ram=256, disk=10, + vcpus=1, metadata=self.flavor_metadata) + self.flavor_creator = OpenStackFlavor( + self.admin_os_creds, flavor_config) + self.flavor_creator.create() + + env_values = { + 'network_name': self.guid + '-network', + 'public_network': self.ext_net_name, + 'agent_image': self.image_creator.image_settings.name, + 'agent_flavor': self.flavor_creator.flavor_settings.name, + 'key_name': self.guid + '-key', + } + + heat_tmplt_path = pkg_resources.resource_filename( + 'snaps.openstack.tests.heat', 'agent-group.yaml') + heat_resource_path = pkg_resources.resource_filename( + 'snaps.openstack.tests.heat', 'agent.yaml') + + stack_settings = StackConfig( + name="{}-{}".format( + self.__class__.__name__, str(self.guid) + '-stack'), + template_path=heat_tmplt_path, + resource_files=[heat_resource_path], + env_values=env_values) + + self.stack_creator = OpenStackHeatStack( + self.os_creds, stack_settings, + [self.image_creator.image_settings]) + + self.vm_inst_creators = list() + + def tearDown(self): + """ + Cleans the stack and downloaded stack file + """ + if self.stack_creator: + try: + self.stack_creator.clean() + except: + pass + + if self.image_creator: + try: + self.image_creator.clean() + except: + pass + + if self.flavor_creator: + try: + self.flavor_creator.clean() + except: + pass + + for vm_inst_creator in self.vm_inst_creators: + try: + keypair_settings = vm_inst_creator.keypair_settings + if keypair_settings and keypair_settings.private_filepath: + expanded_path = os.path.expanduser( + keypair_settings.private_filepath) + os.chmod(expanded_path, 0o755) + os.remove(expanded_path) + except: + pass + + super(self.__class__, self).__clean__() + + def test_nested(self): + """ + Tests the creation of an OpenStack stack from Heat template file and + the retrieval of two VM instance creators and attempt to connect via + SSH to the first one with a floating IP. + """ + created_stack = self.stack_creator.create(block=True) + self.assertIsNotNone(created_stack) + + self.vm_inst_creators = self.stack_creator.get_vm_inst_creators( + heat_keypair_option='private_key') + self.assertIsNotNone(self.vm_inst_creators) + self.assertEqual(1, len(self.vm_inst_creators)) + + for vm_inst_creator in self.vm_inst_creators: + self.assertTrue( + create_instance_tests.validate_ssh_client(vm_inst_creator)) + + +class CreateStackUpdateTests(OSIntegrationTestCase): + """ + Tests to ensure that stack update commands work + """ + + def setUp(self): + self.user_roles = ['heat_stack_owner'] + + super(self.__class__, self).__start__() + + self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) + + self.heat_cli = heat_utils.heat_client(self.os_creds, self.os_session) + self.stack_creator = None + + self.image_creator = OpenStackImage( + self.os_creds, openstack_tests.cirros_image_settings( name=self.guid + '-image', image_metadata=self.image_metadata)) self.image_creator.create() @@ -638,13 +749,14 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): super(self.__class__, self).__clean__() - def test_nested(self): + def test_update(self): """ - Tests the creation of an OpenStack stack from Heat template file and + Tests the update of an OpenStack stack from Heat template file + by changing the number of VM instances from 1 to 2, and the retrieval of two VM instance creators and attempt to connect via SSH to the first one with a floating IP. """ - created_stack = self.stack_creator.create() + created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(created_stack) self.vm_inst_creators = self.stack_creator.get_vm_inst_creators( @@ -656,6 +768,28 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): self.assertTrue( create_instance_tests.validate_ssh_client(vm_inst_creator)) + env_values = { + 'network_name': self.guid + '-network', + 'public_network': self.ext_net_name, + 'agent_count': 2, + 'agent_image': self.image_creator.image_settings.name, + 'agent_flavor': self.flavor_creator.flavor_settings.name, + 'key_name': self.guid + '-key', + } + + updated_stack = self.stack_creator.update(env_values, block=True) + self.assertIsNotNone(updated_stack) + self.assertEqual(STATUS_UPDATE_COMPLETE, updated_stack.status) + + self.vm_inst_creators = self.stack_creator.get_vm_inst_creators( + heat_keypair_option='private_key') + self.assertIsNotNone(self.vm_inst_creators) + self.assertEqual(2, len(self.vm_inst_creators)) + + for vm_inst_creator in self.vm_inst_creators: + self.assertTrue( + create_instance_tests.validate_ssh_client(vm_inst_creator)) + class CreateStackRouterTests(OSIntegrationTestCase): """ @@ -698,7 +832,7 @@ class CreateStackRouterTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - self.created_stack = self.stack_creator.create() + self.created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(self.created_stack) def tearDown(self): @@ -764,7 +898,7 @@ class CreateStackVolumeTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - self.created_stack = self.stack_creator.create() + self.created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(self.created_stack) def tearDown(self): @@ -850,7 +984,7 @@ class CreateStackFlavorTests(OSIntegrationTestCase): template_path=self.heat_tmplt_path) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - self.created_stack = self.stack_creator.create() + self.created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(self.created_stack) def tearDown(self): @@ -916,7 +1050,7 @@ class CreateStackKeypairTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - self.created_stack = self.stack_creator.create() + self.created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(self.created_stack) self.keypair_creators = list() @@ -1000,7 +1134,7 @@ class CreateStackSecurityGroupTests(OSIntegrationTestCase): env_values=self.env_values) self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) - self.created_stack = self.stack_creator.create() + self.created_stack = self.stack_creator.create(block=True) self.assertIsNotNone(self.created_stack) def tearDown(self): @@ -1089,7 +1223,7 @@ class CreateStackNegativeTests(OSIntegrationTestCase): self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) with self.assertRaises(HTTPBadRequest): - self.stack_creator.create() + self.stack_creator.create(block=True) def test_bad_stack_file(self): """ @@ -1100,7 +1234,7 @@ class CreateStackNegativeTests(OSIntegrationTestCase): self.stack_creator = OpenStackHeatStack( self.os_creds, stack_settings) with self.assertRaises(IOError): - self.stack_creator.create() + self.stack_creator.create(block=True) class CreateStackFailureTests(OSIntegrationTestCase): @@ -1197,7 +1331,7 @@ class CreateStackFailureTests(OSIntegrationTestCase): with self.assertRaises(StackError): try: - self.stack_creator.create() + self.stack_creator.create(block=True) except StackError: resources = heat_utils.get_resources( self.heat_cli, self.stack_creator.get_stack().id) diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py index 718d5a3..c15a71f 100644 --- a/snaps/openstack/tests/create_user_tests.py +++ b/snaps/openstack/tests/create_user_tests.py @@ -106,7 +106,8 @@ class CreateUserSuccessTests(OSComponentTestCase): self.user_settings = UserConfig( name=guid + '-name', password=guid + '-password', - roles={'admin': self.os_creds.project_name}, + roles={'admin': self.os_creds.project_name, + 'Admin': self.os_creds.project_name}, domain_name=self.os_creds.user_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds, self.os_session) @@ -183,6 +184,8 @@ class CreateUserSuccessTests(OSComponentTestCase): self.assertEqual(created_user, retrieved_user) role = keystone_utils.get_role_by_name(self.keystone, 'admin') + if not role: + role = keystone_utils.get_role_by_name(self.keystone, 'Admin') self.assertIsNotNone(role) os_proj = keystone_utils.get_project( diff --git a/snaps/openstack/tests/heat/agent-group.yaml b/snaps/openstack/tests/heat/agent-group.yaml index 4b97495..494da0a 100644 --- a/snaps/openstack/tests/heat/agent-group.yaml +++ b/snaps/openstack/tests/heat/agent-group.yaml @@ -70,7 +70,7 @@ resources: network: type: OS::Neutron::Net properties: - name: { get_param: agent_count } + name: { get_param: network_name } subnet: type: OS::Neutron::Subnet diff --git a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml index a191acc..e64c7fc 100644 --- a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml +++ b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml @@ -41,6 +41,10 @@ parameters: label: Instance Flavor for second VM description: Flavor name for the second instance default: m1.med + flavor_extra_specs: + type: json + description: Instance Flavor extra specs + default: {} net_name: type: string label: Test network name @@ -88,12 +92,14 @@ resources: ram: 1024 vcpus: 2 disk: 2 + extra_specs: { get_param: flavor_extra_specs } flavor2: type: OS::Nova::Flavor properties: ram: 1024 vcpus: 2 disk: 2 + extra_specs: { get_param: flavor_extra_specs } network: type: OS::Neutron::Net @@ -140,10 +146,10 @@ resources: floating_network: { get_param: external_net_name } floating_ip_association: - type: OS::Nova::FloatingIPAssociation + type: OS::Neutron::FloatingIPAssociation properties: - floating_ip: { get_resource: floating_ip } - server_id: {get_resource: vm1} + floatingip_id: { get_resource: floating_ip } + port_id: {get_resource: port1} keypair: type: OS::Nova::KeyPair @@ -151,21 +157,28 @@ resources: name: { get_param: keypair_name } save_private_key: True + port1: + type: OS::Neutron::Port + properties: + network: { get_resource: network } + security_groups: [{ get_resource: server_security_group }] + fixed_ips: + - subnet_id: { get_resource: subnet } + vm1: type: OS::Nova::Server - depends_on: [subnet, keypair, flavor1] + depends_on: [subnet, keypair, flavor1, port1] properties: name: { get_param: inst1_name } image: { get_param: image1_name } flavor: { get_resource: flavor1 } key_name: {get_resource: keypair} - security_groups: [{ get_resource: server_security_group }] networks: - - network: { get_resource: network } + - port: { get_resource: port1 } vm2: type: OS::Nova::Server - depends_on: [subnet, flavor2] + depends_on: [subnet, keypair, flavor2] properties: name: { get_param: inst2_name } image: { get_param: image2_name } diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 516d24d..f3a1df7 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -16,6 +16,7 @@ import logging import re from snaps import file_utils +from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.network import NetworkConfig, SubnetConfig from snaps.config.router import RouterConfig @@ -312,22 +313,81 @@ def ubuntu_image_settings(name, url=None, image_metadata=None, public=public) -def get_priv_net_config(project_name, net_name, subnet_name, router_name=None, - cidr='10.55.0.0/24', external_net=None, - netconf_override=None): +def get_priv_net_config(project_name, net_name, mtu=None, subnet_name=None, + router_name=None, cidr='10.55.0.0/24', + external_net=None, netconf_override=None): return OSNetworkConfig( - project_name, net_name, subnet_name, cidr, router_name, + project_name, net_name, mtu, subnet_name, cidr, router_name, external_gateway=external_net, netconf_override=netconf_override) def get_pub_net_config( - project_name, net_name, subnet_name=None, router_name=None, + project_name, net_name, mtu=None, subnet_name=None, router_name=None, cidr='10.55.1.0/24', external_net=None, netconf_override=None): - return OSNetworkConfig(project_name, net_name, subnet_name, cidr, + return OSNetworkConfig(project_name, net_name, mtu, subnet_name, cidr, router_name, external_gateway=external_net, netconf_override=netconf_override) +def get_flavor_config(name, ram, disk, vcpus, ephemeral=None, swap=None, + rxtx_factor=None, is_public=None, metadata=None): + """This method replaces the hard coded basic element (e.g. ram, vcpu, disk + etc) with those are included in the new freeform dict() of metadata + parameter. + + :param name: the flavor name (required) + :param ram: memory in MB to allocate to VM (required) + :param disk: disk storage in GB (required) + :param vcpus: the number of CPUs to allocate to VM (required) + :param ephemeral: the size of the ephemeral disk in GB (default=0) + :param swap: the size of the swap disk in GB (default=0) + :param rxtx_factor: the receive/transmit factor to be set on ports + if backend supports QoS extension (default=1.0) + :param is_public: flag that denotes whether or not other projects + can access image (default=True) + :param metadata: - freeform dict() for special metadata (optional) + - freeform dict() for values of basic elements + (e.g. ram, vcpu, disk, etc) could be added. + As result the hard coded values of those elements will be + overwritten by the new ones (optional) + :return: The FlavorConfig replacing the hard coded basic element values + (e.g. ram, vcpu, disk etc) with those are included in the metadata + dict [optional]. The metadata parameter in the FlavorConfig + consist of the metadata data only. + """ + + metadata_excl = metadata + if metadata: + if 'ram' in metadata: + ram = metadata['ram'] + del metadata_excl['ram'] + if 'disk' in metadata: + disk = metadata['disk'] + del metadata_excl['disk'] + if 'vcpus' in metadata: + vcpus = metadata['vcpus'] + del metadata_excl['vcpus'] + if 'ephemeral' in metadata: + ephemeral = metadata['ephemeral'] + del metadata_excl['ephemeral'] + if 'swap' in metadata: + swap = metadata['swap'] + del metadata_excl['swap'] + if 'rxtx_factor' in metadata: + rxtx_factor = metadata['rxtx_factor'] + del metadata_excl['rxtx_factor'] + if 'is_public' in metadata: + is_public = metadata['is_public'] + del metadata_excl['is_public'] + if 'metadata' in metadata: + metadata_excl = metadata['metadata'] + + return FlavorConfig( + name=name, ram=ram, disk=disk, vcpus=vcpus, ephemeral=ephemeral, + swap=swap, rxtx_factor=rxtx_factor, is_public=is_public, + metadata=metadata_excl) + + class OSNetworkConfig: """ Represents the settings required for the creation of a network in OpenStack @@ -335,7 +395,7 @@ class OSNetworkConfig: physical_network and segmentation_id """ - def __init__(self, project_name, net_name, subnet_name=None, + def __init__(self, project_name, net_name, mtu=None, subnet_name=None, subnet_cidr=None, router_name=None, external_gateway=None, netconf_override=None): """ @@ -345,7 +405,7 @@ class OSNetworkConfig: """ if subnet_name and subnet_cidr: network_conf = NetworkConfig( - name=net_name, subnet_settings=[ + name=net_name, mtu=mtu, subnet_settings=[ SubnetConfig(cidr=subnet_cidr, name=subnet_name)]) else: network_conf = NetworkConfig(name=net_name) diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index 7e70ed0..8b0a7b4 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -50,21 +50,31 @@ class OSComponentTestCase(unittest.TestCase): logging.basicConfig(level=log_level) + self.ext_net_name = None + self.flavor_metadata = None + if os_creds: self.os_creds = os_creds else: - self.os_creds = openstack_tests.get_credentials( - dev_os_env_file=dev_os_env_file) + if file_utils.file_exists(dev_os_env_file): + self.os_creds = openstack_tests.get_credentials( + dev_os_env_file=dev_os_env_file) + test_conf = file_utils.read_yaml(dev_os_env_file) + self.ext_net_name = test_conf.get('ext_net') + os_env_dict = file_utils.read_yaml(dev_os_env_file) + flavor_metadata = os_env_dict.get('flavor_metadata') + if flavor_metadata: + self.flavor_metadata = {'metadata': flavor_metadata} + else: + raise Exception('Unable to obtain OSCreds') self.os_session = keystone_utils.keystone_session(self.os_creds) - self.ext_net_name = ext_net_name - - if not self.ext_net_name and file_utils.file_exists(dev_os_env_file): - test_conf = file_utils.read_yaml(dev_os_env_file) - self.ext_net_name = test_conf.get('ext_net') - self.flavor_metadata = flavor_metadata self.image_metadata = image_metadata + if not self.ext_net_name: + self.ext_net_name = ext_net_name + if not self.flavor_metadata: + self.flavor_metadata = flavor_metadata @staticmethod def parameterize(testcase_klass, os_creds, ext_net_name, @@ -77,8 +87,9 @@ class OSComponentTestCase(unittest.TestCase): test_names = test_loader.getTestCaseNames(testcase_klass) suite = unittest.TestSuite() for name in test_names: - suite.addTest(testcase_klass(name, os_creds, ext_net_name, - flavor_metadata, image_metadata, log_level)) + suite.addTest(testcase_klass( + name, os_creds, ext_net_name, flavor_metadata, image_metadata, + log_level)) return suite def __clean__(self): @@ -123,6 +134,7 @@ class OSIntegrationTestCase(OSComponentTestCase): self.use_keystone = use_keystone self.keystone = None self.user_roles = None + self.proj_users = None @staticmethod def parameterize(testcase_klass, os_creds, ext_net_name, @@ -170,7 +182,7 @@ class OSIntegrationTestCase(OSComponentTestCase): # Set by implementing class for setting the user's roles roles = dict() - if self.user_roles: + if self.user_roles and isinstance(self.user_roles, list): for user_role in self.user_roles: roles[user_role] = project_name @@ -187,6 +199,12 @@ class OSIntegrationTestCase(OSComponentTestCase): # add user to project self.project_creator.assoc_user(self.user_creator.get_user()) + if self.proj_users and isinstance(self.proj_users, list): + for user_name in self.proj_users: + user = keystone_utils.get_user(self.keystone, user_name) + if user: + self.project_creator.assoc_user(user) + def __clean__(self): """ Cleans up test user and project. diff --git a/snaps/openstack/utils/__init__.py b/snaps/openstack/utils/__init__.py index 7f92908..5435f8f 100644 --- a/snaps/openstack/utils/__init__.py +++ b/snaps/openstack/utils/__init__.py @@ -12,4 +12,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__author__ = 'spisarski'
\ No newline at end of file + +__author__ = 'spisarski' diff --git a/snaps/openstack/utils/heat_utils.py b/snaps/openstack/utils/heat_utils.py index b38a7b9..17de020 100644 --- a/snaps/openstack/utils/heat_utils.py +++ b/snaps/openstack/utils/heat_utils.py @@ -15,17 +15,18 @@ import logging import os -import yaml from heatclient.client import Client from heatclient.common.template_format import yaml_loader from novaclient.exceptions import NotFound from oslo_serialization import jsonutils +import yaml from snaps import file_utils from snaps.domain.stack import Stack, Resource, Output - from snaps.openstack.utils import ( keystone_utils, neutron_utils, nova_utils, cinder_utils) +from snaps.thread_utils import worker_pool + __author__ = 'spisarski' @@ -143,6 +144,24 @@ def create_stack(heat_cli, stack_settings): return get_stack_by_id(heat_cli, stack_id=stack['stack']['id']) +def update_stack(heat_cli, stack, env_vals): + """ + Updates the specified parameters in the stack + :param heat_cli: the OpenStack heat client object + :param stack_settings: the stack configuration + """ + args = dict() + + args['stack_name'] = stack.name + args['existing'] = True + + if env_vals: + args['parameters'] = env_vals + heat_cli.stacks.update(stack.id, **args) + else: + logger.warn('Stack not updated, env_vals are None') + + def delete_stack(heat_cli, stack): """ Deletes the Heat stack @@ -220,8 +239,14 @@ def get_stack_networks(heat_cli, neutron, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Neutron::Net') + workers = [] for resource in resources: - network = neutron_utils.get_network_by_id(neutron, resource.id) + worker = worker_pool().apply_async(neutron_utils.get_network_by_id, + (neutron, resource.id)) + workers.append(worker) + + for worker in workers: + network = worker.get() if network: out.append(network) @@ -239,8 +264,14 @@ def get_stack_routers(heat_cli, neutron, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Neutron::Router') + workers = [] for resource in resources: - router = neutron_utils.get_router_by_id(neutron, resource.id) + worker = worker_pool().apply_async(neutron_utils.get_router_by_id, + (neutron, resource.id)) + workers.append(worker) + + for worker in workers: + router = worker.get() if router: out.append(router) @@ -258,9 +289,15 @@ def get_stack_security_groups(heat_cli, neutron, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Neutron::SecurityGroup') + workers = [] for resource in resources: - security_group = neutron_utils.get_security_group_by_id( - neutron, resource.id) + worker = worker_pool().apply_async( + neutron_utils.get_security_group_by_id, + (neutron, resource.id)) + workers.append(worker) + + for worker in workers: + security_group = worker.get() if security_group: out.append(security_group) @@ -281,26 +318,39 @@ def get_stack_servers(heat_cli, nova, neutron, keystone, stack, project_name): out = list() srvr_res = get_resources(heat_cli, stack.id, 'OS::Nova::Server') + workers = [] for resource in srvr_res: + worker = worker_pool().apply_async( + nova_utils.get_server_object_by_id, + (nova, neutron, keystone, resource.id, project_name)) + workers.append((resource.id, worker)) + + for worker in workers: + resource_id = worker[0] try: - server = nova_utils.get_server_object_by_id( - nova, neutron, keystone, resource.id, project_name) + server = worker[1].get() if server: out.append(server) except NotFound: - logger.warn('VmInst cannot be located with ID %s', resource.id) + logger.warn('VmInst cannot be located with ID %s', resource_id) res_grps = get_resources(heat_cli, stack.id, 'OS::Heat::ResourceGroup') for res_grp in res_grps: res_ress = get_resources(heat_cli, res_grp.id) + workers = [] for res_res in res_ress: res_res_srvrs = get_resources( heat_cli, res_res.id, 'OS::Nova::Server') for res_srvr in res_res_srvrs: - server = nova_utils.get_server_object_by_id( - nova, neutron, keystone, res_srvr.id, project_name) - if server: - out.append(server) + worker = worker_pool().apply_async( + nova_utils.get_server_object_by_id, + (nova, neutron, keystone, res_srvr.id, project_name)) + workers.append(worker) + + for worker in workers: + server = worker.get() + if server: + out.append(server) return out @@ -316,13 +366,20 @@ def get_stack_keypairs(heat_cli, nova, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Nova::KeyPair') + workers = [] for resource in resources: + worker = worker_pool().apply_async( + nova_utils.get_keypair_by_id, (nova, resource.id)) + workers.append((resource.id, worker)) + + for worker in workers: + resource_id = worker[0] try: - keypair = nova_utils.get_keypair_by_id(nova, resource.id) + keypair = worker[1].get() if keypair: out.append(keypair) except NotFound: - logger.warn('Keypair cannot be located with ID %s', resource.id) + logger.warn('Keypair cannot be located with ID %s', resource_id) return out @@ -338,13 +395,20 @@ def get_stack_volumes(heat_cli, cinder, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Cinder::Volume') + workers = [] for resource in resources: + worker = worker_pool().apply_async( + cinder_utils.get_volume_by_id, (cinder, resource.id)) + workers.append((resource.id, worker)) + + for worker in workers: + resource_id = worker[0] try: - server = cinder_utils.get_volume_by_id(cinder, resource.id) + server = worker[1].get() if server: out.append(server) except NotFound: - logger.warn('Volume cannot be located with ID %s', resource.id) + logger.warn('Volume cannot be located with ID %s', resource_id) return out @@ -360,13 +424,20 @@ def get_stack_volume_types(heat_cli, cinder, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Cinder::VolumeType') + workers = [] for resource in resources: + worker = worker_pool().apply_async( + cinder_utils.get_volume_type_by_id, (cinder, resource.id)) + workers.append((resource.id, worker)) + + for worker in workers: + resource_id = worker[0] try: - vol_type = cinder_utils.get_volume_type_by_id(cinder, resource.id) + vol_type = worker[1].get() if vol_type: out.append(vol_type) except NotFound: - logger.warn('VolumeType cannot be located with ID %s', resource.id) + logger.warn('VolumeType cannot be located with ID %s', resource_id) return out @@ -383,13 +454,20 @@ def get_stack_flavors(heat_cli, nova, stack): out = list() resources = get_resources(heat_cli, stack.id, 'OS::Nova::Flavor') + workers = [] for resource in resources: + worker = worker_pool().apply_async( + nova_utils.get_flavor_by_id, (nova, resource.id)) + workers.append((resource.id, worker)) + + for worker in workers: + resource_id = worker[0] try: - flavor = nova_utils.get_flavor_by_id(nova, resource.id) + flavor = worker[1].get() if flavor: out.append(flavor) except NotFound: - logger.warn('Flavor cannot be located with ID %s', resource.id) + logger.warn('Flavor cannot be located with ID %s', resource_id) return out diff --git a/snaps/openstack/utils/keystone_utils.py b/snaps/openstack/utils/keystone_utils.py index 52c86d8..4d3c0d3 100644 --- a/snaps/openstack/utils/keystone_utils.py +++ b/snaps/openstack/utils/keystone_utils.py @@ -28,6 +28,7 @@ from snaps.domain.user import User logger = logging.getLogger('keystone_utils') V2_VERSION_NUM = 2.0 +V3_VERSION_NUM = 3 V2_VERSION_STR = 'v' + str(V2_VERSION_NUM) @@ -210,7 +211,7 @@ def create_project(keystone, project_settings): def delete_project(keystone, project): """ Deletes a project - :param keystone: the Keystone clien + :param keystone: the Keystone client :param project: the SNAPS-OO Project domain object """ logger.info('Deleting project with name - %s', project.name) diff --git a/snaps/openstack/utils/launch_utils.py b/snaps/openstack/utils/launch_utils.py index 49d41e7..ddaad12 100644 --- a/snaps/openstack/utils/launch_utils.py +++ b/snaps/openstack/utils/launch_utils.py @@ -24,6 +24,7 @@ import os import time from keystoneauth1.exceptions import Unauthorized +from snaps import file_utils from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig @@ -49,8 +50,13 @@ from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.create_volume_type import OpenStackVolumeType from snaps.openstack.os_credentials import OSCreds, ProxySettings from snaps.openstack.utils import deploy_utils, neutron_utils, keystone_utils +from snaps.openstack.utils.nova_utils import RebootType from snaps.provisioning import ansible_utils +from warnings import warn +warn('This utility will be removed in a subsequent release', + DeprecationWarning) + logger = logging.getLogger('lanuch_utils') DEFAULT_CREDS_KEY = 'admin' @@ -417,10 +423,9 @@ def __apply_ansible_playbooks(ansible_configs, os_creds_dict, vm_dict, 'SSH requests') return False - os_creds = os_creds_dict.get('admin-creds') __apply_ansible_playbook( - ansible_config, os_creds, vm_dict, image_dict, flavor_dict, - networks_dict, routers_dict) + ansible_config, os_creds_dict, vm_dict, image_dict, + flavor_dict, networks_dict, routers_dict) # Return to original directory os.chdir(orig_cwd) @@ -428,12 +433,13 @@ def __apply_ansible_playbooks(ansible_configs, os_creds_dict, vm_dict, return True -def __apply_ansible_playbook(ansible_config, os_creds, vm_dict, image_dict, - flavor_dict, networks_dict, routers_dict): +def __apply_ansible_playbook(ansible_config, os_creds_dict, vm_dict, + image_dict, flavor_dict, networks_dict, + routers_dict): """ Applies an Ansible configuration setting :param ansible_config: the configuration settings - :param os_creds: the OpenStack admin credentials object + :param os_creds_dict: dict where the key is the name and value is OSCreds :param vm_dict: the dictionary of newly instantiated VMs where the name is the key :param image_dict: the dictionary of newly instantiated images where the @@ -459,20 +465,16 @@ def __apply_ansible_playbook(ansible_config, os_creds, vm_dict, image_dict, 'completed') variables = __get_variables( - ansible_config.get('variables'), os_creds, vm_dict, image_dict, - flavor_dict, networks_dict, routers_dict) + ansible_config.get('variables'), os_creds_dict, vm_dict, + image_dict, flavor_dict, networks_dict, routers_dict) - retval = ansible_utils.apply_playbook( + ansible_utils.apply_playbook( ansible_config['playbook_location'], floating_ips, remote_user, ssh_priv_key_file_path=private_key_filepath, variables=variables, proxy_setting=proxy_settings) - if retval != 0: - # Not a fatal type of event - raise Exception( - 'Error applying playbook found at location - %s', - ansible_config.get('playbook_location')) - elif ansible_config.get('post_processing'): + + if 'post_processing' in ansible_config: post_proc_config = ansible_config['post_processing'] if 'sleep' in post_proc_config: time.sleep(post_proc_config['sleep']) @@ -480,9 +482,7 @@ def __apply_ansible_playbook(ansible_config, os_creds, vm_dict, image_dict, for vm_name in post_proc_config['reboot']: if vm_name in vm_dict: logger.info('Rebooting VM - %s', vm_name) - vm_dict[vm_name].reboot() - - return retval + vm_dict[vm_name].reboot(RebootType.hard) def __get_connection_info(ansible_config, vm_dict): @@ -528,13 +528,13 @@ def __get_connection_info(ansible_config, vm_dict): return None -def __get_variables(var_config, os_creds, vm_dict, image_dict, flavor_dict, - networks_dict, routers_dict): +def __get_variables(var_config, os_creds_dict, vm_dict, image_dict, + flavor_dict, networks_dict, routers_dict): """ Returns a dictionary of substitution variables to be used for Ansible templates :param var_config: the variable configuration settings - :param os_creds: the OpenStack admin credentials object + :param os_creds_dict: dict where the key is the name and value is OSCreds :param vm_dict: the dictionary of newly instantiated VMs where the name is the key :param image_dict: the dictionary of newly instantiated images where the @@ -551,7 +551,7 @@ def __get_variables(var_config, os_creds, vm_dict, image_dict, flavor_dict, variables = dict() for key, value in var_config.items(): value = __get_variable_value( - value, os_creds, vm_dict, image_dict, flavor_dict, + value, os_creds_dict, vm_dict, image_dict, flavor_dict, networks_dict, routers_dict) if key and value: variables[key] = value @@ -566,13 +566,13 @@ def __get_variables(var_config, os_creds, vm_dict, image_dict, flavor_dict, return None -def __get_variable_value(var_config_values, os_creds, vm_dict, image_dict, +def __get_variable_value(var_config_values, os_creds_dict, vm_dict, image_dict, flavor_dict, networks_dict, routers_dict): """ Returns the associated variable value for use by Ansible for substitution purposes :param var_config_values: the configuration dictionary - :param os_creds: the OpenStack admin credentials object + :param os_creds_dict: dict where the key is the name and value is OSCreds :param vm_dict: the dictionary of newly instantiated VMs where the name is the key :param image_dict: the dictionary of newly instantiated images where the @@ -590,12 +590,14 @@ def __get_variable_value(var_config_values, os_creds, vm_dict, image_dict, if var_config_values['type'] == 'vm-attr': return __get_vm_attr_variable_value(var_config_values, vm_dict) if var_config_values['type'] == 'os_creds': - return __get_os_creds_variable_value(var_config_values, os_creds) + return __get_os_creds_variable_value(var_config_values, os_creds_dict) + if var_config_values['type'] == 'os_creds_dict': + return str(__get_os_creds_dict(var_config_values, os_creds_dict)) if var_config_values['type'] == 'network': return __get_network_variable_value(var_config_values, networks_dict) if var_config_values['type'] == 'router': return __get_router_variable_value(var_config_values, routers_dict, - os_creds) + os_creds_dict) if var_config_values['type'] == 'port': return __get_vm_port_variable_value(var_config_values, vm_dict) if var_config_values['type'] == 'floating_ip': @@ -604,6 +606,8 @@ def __get_variable_value(var_config_values, os_creds, vm_dict, image_dict, return __get_image_variable_value(var_config_values, image_dict) if var_config_values['type'] == 'flavor': return __get_flavor_variable_value(var_config_values, flavor_dict) + if var_config_values['type'] == 'vm-yaml': + return __create_yaml(var_config_values, vm_dict) return None @@ -632,13 +636,19 @@ def __get_vm_attr_variable_value(var_config_values, vm_dict): return vm.get_image_user() -def __get_os_creds_variable_value(var_config_values, os_creds): +def __get_os_creds_variable_value(var_config_values, os_creds_dict): """ Returns the associated OS credentials value :param var_config_values: the configuration dictionary - :param os_creds: the admin OpenStack OSCreds object + :param os_creds_dict: dict of OpenStack credentials where the key is the + name :return: the value """ + if 'creds_name' in var_config_values: + os_creds = os_creds_dict.get[var_config_values['creds_name']] + else: + os_creds = os_creds_dict.get('admin-creds') + if os_creds: if var_config_values['value'] == 'username': logger.info("Returning OS username") @@ -654,6 +664,21 @@ def __get_os_creds_variable_value(var_config_values, os_creds): return os_creds.project_name +def __get_os_creds_dict(var_config_values, os_creds_dict): + """ + Returns the associated OS credentials as a dict + :param var_config_values: the configuration dictionary + :param os_creds_dict: dict of creds where the key is the username + :return: the value dict + """ + if 'creds_name' in var_config_values: + os_creds = os_creds_dict.get[var_config_values['creds_name']] + else: + os_creds = os_creds_dict.get('admin-creds') + if os_creds: + return os_creds.to_dict() + + def __get_network_variable_value(var_config_values, networks_dict): """ Returns the associated network value @@ -701,15 +726,22 @@ def __get_network_variable_value(var_config_values, networks_dict): return broadcast_ip -def __get_router_variable_value(var_config_values, routers_dict, os_creds): +def __get_router_variable_value(var_config_values, routers_dict, + os_creds_dict): """ Returns the associated network value :param var_config_values: the configuration dictionary :param routers_dict: the dictionary containing all networks where the key is the network name - :param os_creds: the admin OpenStack credentials + :param os_creds_dict: dict of OpenStack credentials where the key is the + name :return: the value """ + if 'creds_name' in var_config_values: + os_creds = os_creds_dict.get[var_config_values['creds_name']] + else: + os_creds = os_creds_dict.get('admin-creds') + router_name = var_config_values.get('router_name') router_creator = routers_dict[router_name] @@ -813,6 +845,36 @@ def __get_flavor_variable_value(var_config_values, flavor_dict): return flavor_creator.get_flavor().id +def __create_yaml(var_config_values, vm_dict): + """ + Creates a yaml file containing an OpenStack pod's credentials with a list + of server IDs that can be used for obtaining SNAPS-OO instances for + manipulation such as rebooting + :param var_config_values: the configuration dictionary + :param vm_dict: the dictionary containing all vm creators where the + key is the name + :return: the name of the generated file + """ + out_dict = dict() + out_dict['vms'] = list() + req_vm_names = var_config_values.get('vms') + + for name, vm_creator in vm_dict.items(): + vm_inst = vm_creator.get_vm_inst() + if vm_inst and vm_inst.name in req_vm_names: + out_dict['vms'].append({ + 'name': str(vm_inst.name), + 'id': str(vm_inst.id), + 'os_creds': vm_creator.get_os_creds().to_dict() + }) + + out_file = file_utils.persist_dict_to_yaml( + out_dict, var_config_values.get('file_name')) + + if out_file: + return out_file.name + + def __cleanup(creators, clean_image=False): """ Cleans up environment diff --git a/snaps/openstack/utils/neutron_utils.py b/snaps/openstack/utils/neutron_utils.py index 8783690..f1a5ac2 100644 --- a/snaps/openstack/utils/neutron_utils.py +++ b/snaps/openstack/utils/neutron_utils.py @@ -262,20 +262,17 @@ def get_subnet_by_name(neutron, keystone, subnet_name, project_name=None): retrieve :return: a SNAPS-OO Subnet domain object or None """ - project = None - if project_name: - project = keystone_utils.get_project( - keystone, project_name=project_name) - if project: - sub_filter = {'name': subnet_name, 'project_id': project.id} - subnets = neutron.list_subnets(**sub_filter) - for subnet in subnets['subnets']: - return Subnet(**subnet) - else: - sub_filter = {'name': subnet_name} - subnets = neutron.list_subnets(**sub_filter) - for subnet in subnets['subnets']: - return Subnet(**subnet) + sub_filter = {'name': subnet_name} + subnets = neutron.list_subnets(**sub_filter) + for subnet in subnets['subnets']: + subnet = Subnet(**subnet) + if project_name: + project = keystone_utils.get_project_by_id( + keystone, subnet.project_id) + if project and project.name == project_name: + return subnet + else: + return subnet def get_subnet_by_id(neutron, subnet_id): @@ -547,8 +544,11 @@ def get_port(neutron, keystone, port_settings=None, port_name=None, project_name = port_settings.project_name if port_settings.network_name: network = get_network( - neutron, keystone, network_name=port_settings.network_name, - project_name=project_name) + neutron, keystone, network_name=port_settings.network_name) + if network and not (network.shared or network.external): + network = get_network( + neutron, keystone, network_name=port_settings.network_name, + project_name=project_name) if network: port_filter['network_id'] = network.id elif port_name: @@ -890,7 +890,7 @@ def __get_os_floating_ip(neutron, floating_ip): """ logger.debug('Attempting to retrieve existing floating ip with IP - %s', floating_ip.ip) - fips = neutron.list_floatingips(ip=floating_ip.id) + fips = neutron.list_floatingips(floating_ip_address=floating_ip.ip) for fip in fips['floatingips']: if fip['id'] == floating_ip.id: diff --git a/snaps/openstack/utils/nova_utils.py b/snaps/openstack/utils/nova_utils.py index 38460c5..005b56f 100644 --- a/snaps/openstack/utils/nova_utils.py +++ b/snaps/openstack/utils/nova_utils.py @@ -206,9 +206,14 @@ def __map_os_server_obj_to_vm_inst(neutron, keystone, os_server, network = neutron_utils.get_network( neutron, keystone, network_name=net_name, project_name=project_name) - ports = neutron_utils.get_ports(neutron, network, ips) - for port in ports: - out_ports.append(port) + if network: + ports = neutron_utils.get_ports(neutron, network, ips) + for port in ports: + out_ports.append(port) + else: + raise NovaException( + 'Unable to locate network in project {} with ' + 'name {}'.format(project_name, net_name)) volumes = None if hasattr(os_server, 'os-extended-volumes:volumes_attached'): @@ -309,8 +314,9 @@ def get_server_security_group_names(nova, server): """ out = list() os_vm_inst = __get_latest_server_os_object(nova, server) - for sec_grp_dict in os_vm_inst.security_groups: - out.append(sec_grp_dict['name']) + if hasattr(os_vm_inst, 'security_groups'): + for sec_grp_dict in os_vm_inst.security_groups: + out.append(sec_grp_dict['name']) return out diff --git a/snaps/openstack/utils/tests/heat_utils_tests.py b/snaps/openstack/utils/tests/heat_utils_tests.py index 53ac3dd..fa240bd 100644 --- a/snaps/openstack/utils/tests/heat_utils_tests.py +++ b/snaps/openstack/utils/tests/heat_utils_tests.py @@ -378,7 +378,7 @@ class HeatUtilsCreateComplexStackTests(OSComponentTestCase): """ resources = heat_utils.get_resources(self.heat_client, self.stack.id) self.assertIsNotNone(resources) - self.assertEqual(12, len(resources)) + self.assertEqual(13, len(resources)) options = heat_utils.get_outputs(self.heat_client, self.stack) self.assertIsNotNone(options) diff --git a/snaps/openstack/utils/tests/neutron_utils_tests.py b/snaps/openstack/utils/tests/neutron_utils_tests.py index d43b969..a55f779 100644 --- a/snaps/openstack/utils/tests/neutron_utils_tests.py +++ b/snaps/openstack/utils/tests/neutron_utils_tests.py @@ -575,9 +575,11 @@ class NeutronUtilsRouterTests(OSComponentTestCase): """ subnet_setting = self.net_config.network_settings.subnet_settings[0] self.net_config = openstack_tests.OSNetworkConfig( - self.os_creds.project_name, self.net_config.network_settings.name, - subnet_setting.name, subnet_setting.cidr, - self.net_config.router_settings.name, self.ext_net_name) + project_name=self.os_creds.project_name, + net_name=self.net_config.network_settings.name, + subnet_name=subnet_setting.name, subnet_cidr=subnet_setting.cidr, + router_name=self.net_config.router_settings.name, + external_gateway=self.ext_net_name) self.router = neutron_utils.create_router( self.neutron, self.os_creds, self.net_config.router_settings) validate_router( @@ -1108,7 +1110,7 @@ Validation routines """ -def validate_network(neutron, keystone, name, exists, project_name): +def validate_network(neutron, keystone, name, exists, project_name, mtu=None): """ Returns true if a network for a given name DOES NOT exist if the exists parameter is false conversely true. Returns false if a network for a given @@ -1126,6 +1128,8 @@ def validate_network(neutron, keystone, name, exists, project_name): return True if not exists and not network: return True + if mtu: + return mtu == network.mtu return False diff --git a/snaps/openstack/utils/tests/nova_utils_tests.py b/snaps/openstack/utils/tests/nova_utils_tests.py index 1f60b9b..7c343f8 100644 --- a/snaps/openstack/utils/tests/nova_utils_tests.py +++ b/snaps/openstack/utils/tests/nova_utils_tests.py @@ -269,16 +269,17 @@ class NovaUtilsInstanceTests(OSComponentTestCase): self.image_creator.create() network_settings = openstack_tests.get_priv_net_config( - self.os_creds.project_name, guid + '-net', - guid + '-subnet').network_settings + project_name=self.os_creds.project_name, + net_name="{}-{}".format(guid, 'net'), + subnet_name="{}-{}".format(guid, 'subnet')).network_settings self.network_creator = OpenStackNetwork( self.os_creds, network_settings) self.network_creator.create() - self.flavor_creator = OpenStackFlavor( - self.os_creds, - FlavorConfig( - name=guid + '-flavor-name', ram=256, disk=10, vcpus=1)) + flavor_config = openstack_tests.get_flavor_config( + name="{}-{}".format(guid, 'flavor-name'), ram=256, disk=10, + vcpus=1, metadata=self.flavor_metadata) + self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_config) self.flavor_creator.create() port_settings = PortConfig( @@ -394,17 +395,19 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): self.image_creator.create() network_settings = openstack_tests.get_priv_net_config( - self.os_creds.project_name, guid + '-net', - guid + '-subnet').network_settings + project_name=self.os_creds.project_name, + net_name="{}-{}".format(guid, 'net'), + subnet_name="{}-{}".format(guid, 'subnet')).network_settings + self.network_creator = OpenStackNetwork( self.os_creds, network_settings) self.network_creator.create() + flavor_settings = openstack_tests.get_flavor_config( + name=guid + '-flavor', ram=256, disk=10, vcpus=1, + metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.os_creds, - FlavorConfig( - name=guid + '-flavor-name', ram=256, disk=10, vcpus=1, - metadata=self.flavor_metadata)) + self.os_creds, flavor_settings) self.flavor_creator.create() # Create Volume diff --git a/snaps/playbook_runner.py b/snaps/playbook_runner.py index 03b7006..7b10390 100644 --- a/snaps/playbook_runner.py +++ b/snaps/playbook_runner.py @@ -67,12 +67,11 @@ def main(parsed_args): if not variables.get('env_file'): variables['env_file'] = parsed_args.env_file - retval = ansible_utils.apply_playbook( + ansible_utils.apply_playbook( parsed_args.playbook, [parsed_args.ip_addr], parsed_args.host_user, ssh_priv_key_file_path=parsed_args.priv_key, password=parsed_args.password, variables=variables, proxy_setting=proxy_settings) - exit(retval) if __name__ == '__main__': diff --git a/snaps/provisioning/ansible_utils.py b/snaps/provisioning/ansible_utils.py index 83fe449..019a8e7 100644 --- a/snaps/provisioning/ansible_utils.py +++ b/snaps/provisioning/ansible_utils.py @@ -21,49 +21,58 @@ import paramiko try: from ansible.parsing.dataloader import DataLoader - from ansible.vars import VariableManager - from ansible.inventory import Inventory + from ansible.vars.manager import VariableManager + from ansible.inventory.manager import InventoryManager from ansible.executor.playbook_executor import PlaybookExecutor except: pass __author__ = 'spisarski' +from warnings import warn +warn('This utility will be removed in a subsequent release', + DeprecationWarning) + logger = logging.getLogger('ansible_utils') -def apply_playbook(playbook_path, hosts_inv, host_user, +def apply_playbook(playbook_path, hosts_inv=None, host_user=None, ssh_priv_key_file_path=None, password=None, variables=None, proxy_setting=None): """ Executes an Ansible playbook to the given host :param playbook_path: the (relative) path to the Ansible playbook :param hosts_inv: a list of hostnames/ip addresses to which to apply the - Ansible playbook + Ansible playbook (not required when PB is configured for + localhost) :param host_user: A user for the host instances (must be a password-less - sudo user if playbook has "sudo: yes" + sudo user if playbook has "sudo: yes") (not required when + PB is configured for localhost) :param ssh_priv_key_file_path: the file location of the ssh key. Required - if password is None + if password is None (not required when PB is + configured for localhost) :param password: the file location of the ssh key. Required if - ssh_priv_key_file_path is None + ssh_priv_key_file_path is None (not required when PB is + configured for localhost) :param variables: a dictionary containing any substitution variables needed by the Jinga 2 templates :param proxy_setting: instance of os_credentials.ProxySettings class - :return: the results + :raises AnsibleException when the return code from the Ansible library is + not 0 + :return: the return code from the Ansible library only when 0. + Implementation now raises an exception otherwise """ if not os.path.isfile(playbook_path): - raise AnsibleException('Requested playbook not found - ' + playbook_path) + raise AnsibleException( + 'Requested playbook not found - ' + playbook_path) pk_file_path = None if ssh_priv_key_file_path: pk_file_path = os.path.expanduser(ssh_priv_key_file_path) if not password: if not os.path.isfile(pk_file_path): - raise AnsibleException('Requested private SSH key not found - ' + - pk_file_path) - - if not ssh_priv_key_file_path and not password: - raise AnsibleException('Invalid credentials, no priv key or password') + raise AnsibleException( + 'Requested private SSH key not found - ' + pk_file_path) passwords = None if password: @@ -72,15 +81,20 @@ def apply_playbook(playbook_path, hosts_inv, host_user, import ansible.constants ansible.constants.HOST_KEY_CHECKING = False - variable_manager = VariableManager() + loader = DataLoader() + inventory = InventoryManager(loader=loader) + if hosts_inv: + for host in hosts_inv: + inventory.add_host(host=host, group='ungrouped') + connection = 'ssh' + else: + connection = 'local' + + variable_manager = VariableManager(loader=loader, inventory=inventory) + if variables: variable_manager.extra_vars = variables - loader = DataLoader() - inventory = Inventory(loader=loader, variable_manager=variable_manager, - host_list=hosts_inv) - variable_manager.set_inventory(inventory) - ssh_extra_args = None if proxy_setting and proxy_setting.ssh_proxy_cmd: ssh_extra_args = '-o ProxyCommand=\'%s\'' % proxy_setting.ssh_proxy_cmd @@ -90,14 +104,15 @@ def apply_playbook(playbook_path, hosts_inv, host_user, 'connection', 'module_path', 'forks', 'remote_user', 'private_key_file', 'ssh_common_args', 'ssh_extra_args', 'become', 'become_method', 'become_user', 'verbosity', - 'check', 'timeout']) + 'check', 'timeout', 'diff']) ansible_opts = options( listtags=False, listtasks=False, listhosts=False, syntax=False, - connection='ssh', module_path=None, forks=100, remote_user=host_user, - private_key_file=pk_file_path, ssh_common_args=None, - ssh_extra_args=ssh_extra_args, become=None, become_method=None, - become_user=None, verbosity=11111, check=False, timeout=30) + connection=connection, module_path=None, forks=100, + remote_user=host_user, private_key_file=pk_file_path, + ssh_common_args=None, ssh_extra_args=ssh_extra_args, become=None, + become_method=None, become_user=None, verbosity=11111, check=False, + timeout=30, diff=None) logger.debug('Setting up Ansible Playbook Executor for playbook - ' + playbook_path) @@ -110,7 +125,15 @@ def apply_playbook(playbook_path, hosts_inv, host_user, passwords=passwords) logger.debug('Executing Ansible Playbook - ' + playbook_path) - return executor.run() + ret_val = executor.run() + + if ret_val != 0: + raise AnsibleException( + 'Error applying playbook [{}] with value [{}] using the connection' + ' type of [{}]'.format( + playbook_path, ret_val, connection)) + + return ret_val def ssh_client(ip, user, private_key_filepath=None, password=None, @@ -143,9 +166,10 @@ def ssh_client(ip, user, private_key_filepath=None, password=None, ssh.connect( ip, username=user, key_filename=pk_abs_path, password=password, sock=proxy_cmd) + logger.info('Obtained SSH connection to %s', ip) return ssh except Exception as e: - logger.warning('Unable to connect via SSH with message - ' + str(e)) + logger.debug('Unable to connect via SSH with message - ' + str(e)) class AnsibleException(Exception): diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 142e8ad..b6ace31 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -19,7 +19,6 @@ import os import pkg_resources from scp import SCPClient -from snaps.config.flavor import FlavorConfig from snaps.config.keypair import KeypairConfig from snaps.config.network import PortConfig from snaps.config.security_group import ( @@ -84,14 +83,15 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): os_image_settings = openstack_tests.ubuntu_image_settings( name=guid + '-' + '-image', image_metadata=self.image_metadata) - self.image_creator = create_image.OpenStackImage(self.os_creds, - os_image_settings) + self.image_creator = create_image.OpenStackImage( + self.os_creds, os_image_settings) self.image_creator.create() # First network is public self.pub_net_config = openstack_tests.get_pub_net_config( project_name=self.os_creds.project_name, - net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', + net_name=guid + '-pub-net', + mtu=1442, subnet_name=guid + '-pub-subnet', router_name=guid + '-pub-router', external_net=self.ext_net_name) @@ -105,11 +105,12 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): self.router_creator.create() # Create Flavor + flavor_config = openstack_tests.get_flavor_config( + name=guid + '-flavor-name', ram=2048, disk=10, + vcpus=2, metadata=self.flavor_metadata) + self.flavor_creator = create_flavor.OpenStackFlavor( - self.admin_os_creds, - FlavorConfig( - name=guid + '-flavor-name', ram=2048, disk=10, vcpus=2, - metadata=self.flavor_metadata)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() # Create Key/Pair @@ -264,8 +265,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): relative_pb_path = pkg_resources.resource_filename( 'snaps.provisioning.tests.playbooks', 'simple_playbook.yml') - retval = self.inst_creator.apply_ansible_playbook(relative_pb_path) - self.assertEqual(0, retval) + self.inst_creator.apply_ansible_playbook(relative_pb_path) ssh = ansible_utils.ssh_client( ip, user, private_key_filepath=priv_key, @@ -331,9 +331,8 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): relative_pb_path = pkg_resources.resource_filename( 'snaps.provisioning.tests.playbooks', 'template_playbook.yml') - retval = self.inst_creator.apply_ansible_playbook( + self.inst_creator.apply_ansible_playbook( relative_pb_path, variables={'name': 'Foo'}) - self.assertEqual(0, retval) ssh = ansible_utils.ssh_client( ip, user, private_key_filepath=priv_key, diff --git a/snaps/test_runner.py b/snaps/test_runner.py index 830881a..d46fe86 100644 --- a/snaps/test_runner.py +++ b/snaps/test_runner.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. import argparse -import json import logging import unittest from concurrencytest import ConcurrentTestSuite, fork_for_tests @@ -36,8 +35,7 @@ def __create_concurrent_test_suite( source_filename, ext_net_name, proxy_settings, ssh_proxy_cmd, run_unit_tests, run_connection_tests, run_api_tests, run_integration_tests, run_staging_tests, flavor_metadata, - image_metadata, use_keystone, use_floating_ips, continuous_integration, - log_level): + image_metadata, use_floating_ips, continuous_integration, log_level): """ Compiles the tests that can be run concurrently :param source_filename: the OpenStack credentials file (required) @@ -58,9 +56,6 @@ def __create_concurrent_test_suite( created for test VM instance :param image_metadata: dict() object containing the metadata for overriding default images within the tests - :param use_keystone: when true, tests creating users and projects will be - exercised and must be run on a host that - has access to the cloud's administrative network :param use_floating_ips: when true, tests requiring floating IPs will be executed :param continuous_integration: when true, tests for CI will be run @@ -81,20 +76,20 @@ def __create_concurrent_test_suite( if run_connection_tests: tsb.add_openstack_client_tests( suite=suite, os_creds=os_creds, ext_net_name=ext_net_name, - use_keystone=use_keystone, log_level=log_level) + use_keystone=True, log_level=log_level) # Tests the OpenStack API calls if run_api_tests: tsb.add_openstack_api_tests( suite=suite, os_creds=os_creds, ext_net_name=ext_net_name, - use_keystone=use_keystone, flavor_metadata=flavor_metadata, + use_keystone=True, flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level) # Long running integration type tests if run_integration_tests: tsb.add_openstack_integration_tests( suite=suite, os_creds=os_creds, ext_net_name=ext_net_name, - use_keystone=use_keystone, flavor_metadata=flavor_metadata, + use_keystone=True, flavor_metadata=flavor_metadata, image_metadata=image_metadata, use_floating_ips=use_floating_ips, log_level=log_level) @@ -106,7 +101,7 @@ def __create_concurrent_test_suite( if continuous_integration: tsb.add_openstack_ci_tests( suite=suite, os_creds=os_creds, ext_net_name=ext_net_name, - use_keystone=use_keystone, flavor_metadata=flavor_metadata, + use_keystone=True, flavor_metadata=flavor_metadata, image_metadata=image_metadata, use_floating_ips=use_floating_ips, log_level=log_level) return suite @@ -114,7 +109,7 @@ def __create_concurrent_test_suite( def __create_sequential_test_suite( source_filename, ext_net_name, proxy_settings, ssh_proxy_cmd, - run_integration_tests, flavor_metadata, image_metadata, use_keystone, + run_integration_tests, flavor_metadata, image_metadata, use_floating_ips, log_level): """ Compiles the tests that cannot be run in parallel @@ -129,9 +124,6 @@ def __create_sequential_test_suite( created for test VM instance :param image_metadata: dict() object containing the metadata for overriding default images within the tests - :param use_keystone: when true, tests creating users and projects will be - exercised and must be run on a host that - has access to the cloud's administrative network :param use_floating_ips: when true, tests requiring floating IPs will be executed :param log_level: the logging level @@ -146,7 +138,7 @@ def __create_sequential_test_suite( tsb.add_ansible_integration_tests( suite=suite, os_creds=os_creds, ext_net_name=ext_net_name, - use_keystone=use_keystone, flavor_metadata=flavor_metadata, + use_keystone=True, flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level) return suite @@ -185,7 +177,8 @@ def main(arguments): flavor_metadata = None if arguments.flavor_metadata: - flavor_metadata = json.loads(arguments.flavor_metadata) + flavor_metadata = { + 'metadata': {'hw:mem_page_size': arguments.flavor_metadata}} image_metadata = None if arguments.image_metadata_file: @@ -212,7 +205,6 @@ def main(arguments): arguments.env, arguments.ext_net, arguments.proxy, arguments.ssh_proxy_cmd, unit, connection, api, integration, staging, flavor_metadata, image_metadata, - arguments.use_keystone != ARG_NOT_SET, arguments.floating_ips != ARG_NOT_SET, ci, log_level) @@ -222,7 +214,6 @@ def main(arguments): arguments.env, arguments.ext_net, arguments.proxy, arguments.ssh_proxy_cmd, integration, flavor_metadata, image_metadata, - arguments.use_keystone != ARG_NOT_SET, arguments.floating_ips != ARG_NOT_SET, log_level) else: logger.error('Environment file or external network not defined') @@ -314,15 +305,9 @@ if __name__ == '__main__': nargs='?', help='When argument is set, all integration tests requiring' ' Floating IPs will be executed') parser.add_argument( - '-k', '--use-keystone', dest='use_keystone', default=ARG_NOT_SET, - nargs='?', - help='When argument is set, the tests will exercise the keystone APIs ' - 'and must be run on a machine that has access to the admin ' - 'network and is able to create users and groups') - parser.add_argument( '-fm', '--flavor-meta', dest='flavor_metadata', - help='JSON string to be used as flavor metadata for all test instances' - ' created') + help='hw:mem_page_size flavor setting value (i.e. large). ' + 'Required for DPDK') parser.add_argument( '-im', '--image-meta', dest='image_metadata_file', default=None, help='Location of YAML file containing the image metadata') diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py index 35a39f2..52008a6 100644 --- a/snaps/test_suite_builder.py +++ b/snaps/test_suite_builder.py @@ -86,7 +86,7 @@ from snaps.openstack.tests.create_qos_tests import ( from snaps.openstack.tests.create_router_tests import ( CreateRouterSuccessTests, CreateRouterNegativeTests, RouterSettingsUnitTests, CreateMultipleRouterTests, - CreateRouterSecurityGroupTests) + CreateRouterSecurityGroupTests, CreateRouterSharedNetworksTests) from snaps.openstack.tests.create_security_group_tests import ( CreateSecurityGroupTests, SecurityGroupRuleSettingsUnitTests, SecurityGroupSettingsUnitTests, CreateMultipleSecurityGroupTests) @@ -94,7 +94,8 @@ from snaps.openstack.tests.create_stack_tests import ( StackSettingsUnitTests, CreateStackSuccessTests, CreateStackNegativeTests, CreateStackFlavorTests, CreateStackFloatingIpTests, CreateStackNestedResourceTests, CreateStackKeypairTests, - CreateStackVolumeTests, CreateStackSecurityGroupTests) + CreateStackVolumeTests, CreateStackSecurityGroupTests, + CreateStackUpdateTests) from snaps.openstack.tests.create_user_tests import ( UserSettingsUnitTests, CreateUserSuccessTests) from snaps.openstack.tests.create_volume_tests import ( @@ -545,6 +546,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name, flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize( + CreateRouterSharedNetworksTests, os_creds=os_creds, + ext_net_name=ext_net_name, use_keystone=use_keystone, + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) + suite.addTest(OSIntegrationTestCase.parameterize( CreateQoSTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone, flavor_metadata=flavor_metadata, image_metadata=image_metadata, @@ -683,6 +689,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name, ext_net_name=ext_net_name, use_keystone=use_keystone, flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level)) + suite.addTest(OSIntegrationTestCase.parameterize( + CreateStackUpdateTests, os_creds=os_creds, + ext_net_name=ext_net_name, use_keystone=use_keystone, + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) def add_ansible_integration_tests(suite, os_creds, ext_net_name, diff --git a/snaps/thread_utils.py b/snaps/thread_utils.py new file mode 100644 index 0000000..3a3eb4d --- /dev/null +++ b/snaps/thread_utils.py @@ -0,0 +1,27 @@ +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") +# and others. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from multiprocessing.pool import ThreadPool + +_pool = None + + +# Define a thread pool with a limit for how many simultaneous API requests +# can be in progress at once. +def worker_pool(size=5): + global _pool + if _pool is None: + _pool = ThreadPool(processes=size) + return _pool @@ -0,0 +1,17 @@ +[tox] +minversion = 1.6 +envlist = + docs, + docs-linkcheck +skipsdist = true + +[testenv:docs] +deps = -rdocs/requirements.txt +commands = + sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + echo "Generated docs available in {toxinidir}/docs/_build/html" +whitelist_externals = echo + +[testenv:docs-linkcheck] +deps = -rdocs/requirements.txt +commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck |