diff options
| -rw-r--r-- | snaps/openstack/create_instance.py | 26 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 41 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_user_tests.py | 4 | ||||
| -rw-r--r-- | snaps/openstack/utils/keystone_utils.py | 30 | ||||
| -rw-r--r-- | snaps/openstack/utils/neutron_utils.py | 55 | ||||
| -rw-r--r-- | snaps/openstack/utils/nova_utils.py | 85 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/keystone_utils_tests.py | 2 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/neutron_utils_tests.py | 7 | ||||
| -rw-r--r-- | snaps/provisioning/ansible_utils.py | 10 | ||||
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 8 |
10 files changed, 170 insertions, 98 deletions
diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py index b034c5f..97f04f3 100644 --- a/snaps/openstack/create_instance.py +++ b/snaps/openstack/create_instance.py @@ -334,12 +334,12 @@ class OpenStackVmInstance: """ return self.__vm - def get_os_vm_server_obj(self): + def get_console_output(self): """ - Returns the OpenStack server object - :return: the server object + Returns the vm console object for parsing logs + :return: the console output object """ - return nova_utils.get_latest_server_os_object(self.__nova, self.__vm) + return nova_utils.get_server_console_output(self.__nova, self.__vm) def get_port_ip(self, port_name, subnet_name=None): """ @@ -394,6 +394,13 @@ class OpenStackVmInstance: logger.warning('Cannot find port with name - ' + port_name) return None + def get_vm_info(self): + """ + Returns a dictionary of a VMs info as returned by OpenStack + :return: a dict() + """ + return nova_utils.get_server_info(self.__nova, self.__vm) + def config_nics(self): """ Responsible for configuring NICs on RPM systems where the instance has @@ -555,18 +562,17 @@ class OpenStackVmInstance: if not self.__vm: return False - instance = nova_utils.get_latest_server_os_object( - self.__nova, self.__vm) - if not instance: + status = nova_utils.get_server_status(self.__nova, self.__vm) + if not status: logger.warning('Cannot find instance with id - ' + self.__vm.id) return False - if instance.status == 'ERROR': + if status == 'ERROR': raise Exception('Instance had an error during deployment') logger.debug( 'Instance status [%s] is - %s', self.instance_settings.name, - instance.status) - return instance.status == expected_status_code + status) + return status == expected_status_code def vm_ssh_active(self, block=False, poll_interval=POLL_INTERVAL): """ diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 6b2307e..ebdb76a 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -355,14 +355,14 @@ class SimpleHealthCheck(OSIntegrationTestCase): self.inst_creator = OpenStackVmInstance( self.os_creds, instance_settings, self.image_creator.image_settings) - vm = self.inst_creator.create() + self.inst_creator.create() ip = self.inst_creator.get_port_ip(self.port_settings.name) self.assertIsNotNone(ip) self.assertTrue(self.inst_creator.vm_active(block=True)) - self.assertTrue(check_dhcp_lease(self.nova, vm, ip)) + self.assertTrue(check_dhcp_lease(self.inst_creator, ip)) class CreateInstanceSimpleTests(OSIntegrationTestCase): @@ -698,7 +698,7 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): self.assertTrue(inst_creator.vm_active(block=True)) ip = inst_creator.get_port_ip(port_settings.name) - self.assertTrue(check_dhcp_lease(self.nova, vm_inst, ip)) + self.assertTrue(check_dhcp_lease(inst_creator, ip)) inst_creator.add_security_group( self.sec_grp_creator.get_security_group()) @@ -736,7 +736,7 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): self.assertTrue(inst_creator.vm_active(block=True)) ip = inst_creator.get_port_ip(port_settings.name) - self.assertTrue(check_dhcp_lease(self.nova, vm_inst, ip)) + self.assertTrue(check_dhcp_lease(inst_creator, ip)) inst_creator.add_security_group( self.sec_grp_creator.get_security_group()) @@ -1167,9 +1167,9 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): for zone in zones: creator = self.inst_creators[index] self.assertTrue(creator.vm_active(block=True)) - vm = creator.get_os_vm_server_obj() - deployed_zone = vm._info['OS-EXT-AZ:availability_zone'] - deployed_host = vm._info['OS-EXT-SRV-ATTR:host'] + info = creator.get_vm_info() + deployed_zone = info['OS-EXT-AZ:availability_zone'] + deployed_host = info['OS-EXT-SRV-ATTR:host'] self.assertEqual(zone, deployed_zone + ':' + deployed_host) index += 1 @@ -1391,7 +1391,7 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase): self.assertTrue(self.inst_creator.vm_active(block=True)) ip = self.inst_creator.get_port_ip(ports_settings[0].name) - self.assertTrue(check_dhcp_lease(self.nova, vm_inst, ip)) + self.assertTrue(check_dhcp_lease(self.inst_creator, ip)) # Add security group to VM self.inst_creator.add_security_group( @@ -1694,18 +1694,13 @@ def inst_has_sec_grp(nova, vm_inst, sec_grp_name): :param nova: the nova client :param vm_inst: the VmInst domain object :param sec_grp_name: the name of the security group to validate - :return: + :return: T/F """ - vm = nova_utils.get_latest_server_os_object(nova, vm_inst) - if not hasattr(vm, 'security_groups'): - return False - - found = False - for sec_grp_dict in vm.security_groups: - if sec_grp_name in sec_grp_dict['name']: - found = True - break - return found + sec_grp_names = nova_utils.get_server_security_group_names(nova, vm_inst) + for name in sec_grp_names: + if sec_grp_name == name: + return True + return False def validate_ssh_client(instance_creator): @@ -2358,11 +2353,10 @@ class CreateInstanceMockOfflineTests(OSComponentTestCase): self.assertTrue(self.inst_creator.vm_active(block=True)) -def check_dhcp_lease(nova_client, vm_domain, ip, timeout=160): +def check_dhcp_lease(inst_creator, ip, timeout=160): """ Returns true if the expected DHCP lease has been acquired - :param nova_client: the nova client - :param vm_domain: the SNAPS VM instance domain object + :param inst_creator: the SNAPS OpenStackVmInstance object :param ip: the IP address to look for :param timeout: how long to query for IP address :return: @@ -2373,8 +2367,7 @@ def check_dhcp_lease(nova_client, vm_domain, ip, timeout=160): logger.info("Looking for IP %s in the console log" % ip) full_log = '' while timeout > time.time() - start_time: - vm = nova_utils.get_latest_server_os_object(nova_client, vm_domain) - output = vm.get_console_output() + output = inst_creator.get_console_output() full_log = full_log + output if re.search(ip, output): logger.info('DHCP lease obtained logged in console') diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py index 96de61e..7519700 100644 --- a/snaps/openstack/tests/create_user_tests.py +++ b/snaps/openstack/tests/create_user_tests.py @@ -177,12 +177,12 @@ class CreateUserSuccessTests(OSComponentTestCase): self.assertIsNotNone(retrieved_user) self.assertEqual(created_user, retrieved_user) - role = keystone_utils._get_os_role_by_name(self.keystone, 'admin') + role = keystone_utils.get_role_by_name(self.keystone, 'admin') self.assertIsNotNone(role) os_proj = keystone_utils.get_project( keystone=self.keystone, project_name=self.os_creds.project_name) - user_roles = keystone_utils._get_os_roles_by_user( + user_roles = keystone_utils.get_roles_by_user( self.keystone, retrieved_user, os_proj) self.assertIsNotNone(user_roles) self.assertEqual(1, len(user_roles)) diff --git a/snaps/openstack/utils/keystone_utils.py b/snaps/openstack/utils/keystone_utils.py index c671b18..9bfc647 100644 --- a/snaps/openstack/utils/keystone_utils.py +++ b/snaps/openstack/utils/keystone_utils.py @@ -102,7 +102,7 @@ def get_project(keystone=None, os_creds=None, project_name=None): :param os_creds: the OpenStack credentials used to obtain the Keystone client if the keystone parameter is None :param project_name: the name to query - :return: the ID or None + :return: the SNAPS-OO Project domain object or None """ if not project_name: return None @@ -134,14 +134,16 @@ def create_project(keystone, project_settings): :return: SNAPS-OO Project domain object """ if keystone.version == V2_VERSION: - return keystone.tenants.create( + os_project = keystone.tenants.create( project_settings.name, project_settings.description, project_settings.enabled) + else: + os_project = keystone.projects.create( + project_settings.name, project_settings.domain, + description=project_settings.description, + enabled=project_settings.enabled) - return keystone.projects.create( - project_settings.name, project_settings.domain, - description=project_settings.description, - enabled=project_settings.enabled) + return Project(name=os_project.name, project_id=os_project.id) def delete_project(keystone, project): @@ -215,12 +217,12 @@ def create_user(keystone, user_settings): domain=user_settings.domain_name, enabled=user_settings.enabled) for role_name, role_project in user_settings.roles.items(): - os_role = _get_os_role_by_name(keystone, role_name) + os_role = get_role_by_name(keystone, role_name) os_project = get_project(keystone=keystone, project_name=role_project) if os_role and os_project: - existing_roles = _get_os_roles_by_user(keystone, os_user, - os_project) + existing_roles = get_roles_by_user(keystone, os_user, + os_project) found = False for role in existing_roles: if role.id == os_role.id: @@ -244,7 +246,7 @@ def delete_user(keystone, user): keystone.users.delete(user.id) -def _get_os_role_by_name(keystone, name): +def get_role_by_name(keystone, name): """ Returns an OpenStack role object of a given name or None if not exists :param keystone: the keystone client @@ -257,9 +259,9 @@ def _get_os_role_by_name(keystone, name): return Role(name=role.name, role_id=role.id) -def _get_os_roles_by_user(keystone, user, project): +def get_roles_by_user(keystone, user, project): """ - Returns a list of OpenStack role object associated with a user + Returns a list of SNAPS-OO Role domain objects associated with a user :param keystone: the keystone client :param user: the OpenStack user object :param project: the OpenStack project object (only required for v2) @@ -277,7 +279,7 @@ def _get_os_roles_by_user(keystone, user, project): return out -def __get_os_role_by_id(keystone, role_id): +def get_role_by_id(keystone, role_id): """ Returns an OpenStack role object of a given name or None if not exists :param keystone: the keystone client @@ -319,7 +321,7 @@ def grant_user_role_to_project(keystone, role, user, project): :return: """ - os_role = __get_os_role_by_id(keystone, role.id) + os_role = get_role_by_id(keystone, role.id) if keystone.version == V2_VERSION: keystone.roles.add_user_role(user, os_role, tenant=project) else: diff --git a/snaps/openstack/utils/neutron_utils.py b/snaps/openstack/utils/neutron_utils.py index dfae98b..d93faa0 100644 --- a/snaps/openstack/utils/neutron_utils.py +++ b/snaps/openstack/utils/neutron_utils.py @@ -59,8 +59,7 @@ def create_network(neutron, os_creds, network_settings): os_network = neutron.create_network(body=json_body) return Network(**os_network['network']) else: - logger.error("Failed to create network") - raise Exception + raise NeutronException('Failded to create network') def delete_network(neutron, network): @@ -93,10 +92,7 @@ def get_network(neutron, network_name, project_id=None): for network, netInsts in networks.items(): for inst in netInsts: if inst.get('name') == network_name: - if project_id and inst.get('project_id') == project_id: - return {'network': inst} - else: - return Network(**inst) + return Network(**inst) return None @@ -133,8 +129,7 @@ def create_subnet(neutron, subnet_settings, os_creds, network=None): subnets = neutron.create_subnet(body=json_body) return Subnet(**subnets['subnets'][0]) else: - logger.error("Failed to create subnet.") - raise Exception + raise NeutronException('Failed to create subnet') def delete_subnet(neutron, subnet): @@ -180,7 +175,7 @@ def create_router(neutron, os_creds, router_settings): return Router(**os_router['router']) else: logger.error("Failed to create router.") - raise Exception + raise NeutronException('Failed to create router') def delete_router(neutron, router): @@ -220,8 +215,9 @@ def add_interface_router(neutron, router, subnet=None, port=None): :return: the interface router object """ if subnet and port: - raise Exception('Cannot add interface to the router. Both subnet and ' - 'port were sent in. Either or please.') + raise NeutronException( + 'Cannot add interface to the router. Both subnet and ' + 'port were sent in. Either or please.') if neutron and router and (router or subnet): logger.info('Adding interface to router with name ' + router.name) @@ -229,8 +225,9 @@ def add_interface_router(neutron, router, subnet=None, port=None): router=router.id, body=__create_port_json_body(subnet, port)) return InterfaceRouter(**os_intf_router) else: - raise Exception('Unable to create interface router as neutron client,' - ' router or subnet were not created') + raise NeutronException( + 'Unable to create interface router as neutron client,' + ' router or subnet were not created') def remove_interface_router(neutron, router, subnet=None, port=None): @@ -266,9 +263,11 @@ def __create_port_json_body(subnet=None, port=None): :return: the dict """ if subnet and port: - raise Exception('Cannot create JSON body with both subnet and port') + raise NeutronException( + 'Cannot create JSON body with both subnet and port') if not subnet and not port: - raise Exception('Cannot create JSON body without subnet or port') + raise NeutronException( + 'Cannot create JSON body without subnet or port') if subnet: return {"subnet_id": subnet.id} @@ -299,7 +298,6 @@ def delete_port(neutron, port): Removes an OpenStack port :param neutron: the client :param port: the SNAPS-OO Port domain object - :return: """ logger.info('Deleting port with name ' + port.name) neutron.delete_port(port.id) @@ -310,7 +308,7 @@ def get_port_by_name(neutron, port_name): Returns the first port object (dictionary) found with a given name :param neutron: the client :param port_name: the name of the port to retrieve - :return: + :return: a SNAPS-OO Port domain object """ ports = neutron.list_ports(**{'name': port_name}) for port in ports['ports']: @@ -326,7 +324,7 @@ def create_security_group(neutron, keystone, sec_grp_settings): :param neutron: the Neutron client :param keystone: the Keystone client :param sec_grp_settings: the security group settings - :return: the security group object + :return: a SNAPS-OO SecurityGroup domain object """ logger.info('Creating security group with name - %s', sec_grp_settings.name) @@ -354,6 +352,7 @@ def get_security_group(neutron, name): Returns the first security group object of the given name else None :param neutron: the client :param name: the name of security group object to retrieve + :return: a SNAPS-OO SecurityGroup domain object or None if not found """ logger.info('Retrieving security group with name - ' + name) @@ -371,6 +370,7 @@ def get_security_group_by_id(neutron, sec_grp_id): Returns the first security group object of the given name else None :param neutron: the client :param sec_grp_id: the id of the security group to retrieve + :return: a SNAPS-OO SecurityGroup domain object or None if not found """ logger.info('Retrieving security group with ID - ' + sec_grp_id) @@ -388,7 +388,7 @@ def create_security_group_rule(neutron, sec_grp_rule_settings): Creates a security group object in OpenStack :param neutron: the client :param sec_grp_rule_settings: the security group rule settings - :return: the security group object + :return: a SNAPS-OO SecurityGroupRule domain object """ logger.info('Creating security group to security group - %s', sec_grp_rule_settings.sec_grp_name) @@ -412,7 +412,7 @@ def get_rules_by_security_group(neutron, sec_grp): """ Retrieves all of the rules for a given security group :param neutron: the client - :param sec_grp: the SNAPS SecurityGroup object + :param sec_grp: a list of SNAPS SecurityGroupRule domain objects """ logger.info('Retrieving security group rules associate with the ' 'security group - %s', sec_grp.name) @@ -431,6 +431,7 @@ def get_rule_by_id(neutron, sec_grp, rule_id): :param neutron: the client :param sec_grp: the SNAPS SecurityGroup domain object :param rule_id: the rule's ID + :param sec_grp: a SNAPS SecurityGroupRule domain object """ rules = neutron.list_security_group_rules( **{'security_group_id': sec_grp.id}) @@ -445,12 +446,12 @@ def get_external_networks(neutron): Returns a list of external OpenStack network object/dict for all external networks :param neutron: the client - :return: a list of external networks (empty list if none configured) + :return: a list of external networks of Type SNAPS-OO domain class Network """ out = list() for network in neutron.list_networks( **{'router:external': True})['networks']: - out.append({'network': network}) + out.append(Network(**network)) return out @@ -487,8 +488,8 @@ def create_floating_ip(neutron, ext_net_name): return FloatingIp(inst_id=fip['floatingip']['id'], ip=fip['floatingip']['floating_ip_address']) else: - raise Exception('Cannot create floating IP, ' - 'external network not found') + raise NeutronException( + 'Cannot create floating IP, external network not found') def get_floating_ip(neutron, floating_ip): @@ -534,3 +535,9 @@ def delete_floating_ip(neutron, floating_ip): logger.debug('Attempting to delete existing floating ip with IP - %s', floating_ip.ip) return neutron.delete_floatingip(floating_ip.id) + + +class NeutronException(Exception): + """ + Exception when calls to the Keystone client cannot be served properly + """ diff --git a/snaps/openstack/utils/nova_utils.py b/snaps/openstack/utils/nova_utils.py index 1ced4d7..fd42c5d 100644 --- a/snaps/openstack/utils/nova_utils.py +++ b/snaps/openstack/utils/nova_utils.py @@ -79,9 +79,8 @@ def create_server(nova, neutron, glance, instance_settings, image_settings, flavor = get_flavor_by_name(nova, instance_settings.flavor) if not flavor: - raise Exception( - 'Flavor not found with name - %s', - instance_settings.flavor) + raise NovaException( + 'Flavor not found with name - %s', instance_settings.flavor) image = glance_utils.get_image(glance, image_settings.name) if image: @@ -99,7 +98,7 @@ def create_server(nova, neutron, glance, instance_settings, image_settings, return VmInst(name=server.name, inst_id=server.id, networks=server.networks) else: - raise Exception( + raise NovaException( 'Cannot create instance, image cannot be located with name %s', image_settings.name) @@ -109,7 +108,7 @@ def get_servers_by_name(nova, name): Returns a list of servers with a given name :param nova: the Nova client :param name: the server name - :return: the list of servers + :return: the list of snaps.domain.VmInst objects """ out = list() servers = nova.servers.list(search_opts={'name': name}) @@ -119,7 +118,7 @@ def get_servers_by_name(nova, name): return out -def get_latest_server_os_object(nova, server): +def __get_latest_server_os_object(nova, server): """ Returns a server with a given id :param nova: the Nova client @@ -129,6 +128,32 @@ def get_latest_server_os_object(nova, server): return nova.servers.get(server.id) +def get_server_status(nova, server): + """ + Returns the a VM instance's status from OpenStack + :param nova: the Nova client + :param server: the domain VmInst object + :return: the VM's string status or None if not founc + """ + server = __get_latest_server_os_object(nova, server) + if server: + return server.status + return None + + +def get_server_console_output(nova, server): + """ + Returns the console object for parsing VM activity + :param nova: the Nova client + :param server: the domain VmInst object + :return: the console output object or None if server object is not found + """ + server = __get_latest_server_os_object(nova, server) + if server: + return server.get_console_output() + return None + + def get_latest_server_object(nova, server): """ Returns a server with a given id @@ -136,11 +161,38 @@ def get_latest_server_object(nova, server): :param server: the old server object :return: the list of servers or None if not found """ - server = get_latest_server_os_object(nova, server) + server = __get_latest_server_os_object(nova, server) return VmInst(name=server.name, inst_id=server.id, networks=server.networks) +def get_server_security_group_names(nova, server): + """ + Returns a server with a given id + :param nova: the Nova client + :param server: the old server object + :return: the list of security groups associated with a VM + """ + 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']) + return out + + +def get_server_info(nova, server): + """ + Returns a dictionary of a VMs info as returned by OpenStack + :param nova: the Nova client + :param server: the old server object + :return: a dict of the info if VM exists else None + """ + vm = __get_latest_server_os_object(nova, server) + if vm: + return vm._info + return None + + def create_keys(key_size=2048): """ Generates public and private keys @@ -168,7 +220,6 @@ def save_keys_to_files(keys=None, pub_file_path=None, priv_file_path=None): :param keys: the keys to save generated by cryptography :param pub_file_path: the path to the public keys :param priv_file_path: the path to the private keys - :return: None """ if keys: if pub_file_path: @@ -297,7 +348,7 @@ def delete_vm_instance(nova, vm_inst): nova.servers.delete(vm_inst.id) -def get_os_flavor(nova, flavor): +def __get_os_flavor(nova, flavor): """ Returns to OpenStack flavor object by name :param nova: the Nova client @@ -317,7 +368,7 @@ def get_flavor(nova, flavor): :param flavor: the SNAPS flavor domain object :return: the SNAPS Flavor domain object """ - os_flavor = get_os_flavor(nova, flavor) + os_flavor = __get_os_flavor(nova, flavor) if os_flavor: return Flavor( name=os_flavor.name, id=os_flavor.id, ram=os_flavor.ram, @@ -330,7 +381,7 @@ def get_flavor(nova, flavor): return None -def get_os_flavor_by_name(nova, name): +def __get_os_flavor_by_name(nova, name): """ Returns to OpenStack flavor object by name :param nova: the Nova client @@ -350,7 +401,7 @@ def get_flavor_by_name(nova, name): :param name: the flavor name to return :return: the SNAPS flavor domain object or None if not exists """ - os_flavor = get_os_flavor_by_name(nova, name) + os_flavor = __get_os_flavor_by_name(nova, name) if os_flavor: return Flavor( name=os_flavor.name, id=os_flavor.id, ram=os_flavor.ram, @@ -395,7 +446,7 @@ def set_flavor_keys(nova, flavor, metadata): :param flavor: the SNAPS flavor domain object :param metadata: the metadata to set """ - os_flavor = get_os_flavor(nova, flavor) + os_flavor = __get_os_flavor(nova, flavor) if os_flavor: os_flavor.set_keys(metadata) @@ -428,5 +479,11 @@ def add_floating_ip_to_server(nova, vm, floating_ip, ip_addr): :param floating_ip: FloatingIp domain object :param ip_addr: the IP to which to bind the floating IP to """ - vm = get_latest_server_os_object(nova, vm) + vm = __get_latest_server_os_object(nova, vm) vm.add_floating_ip(floating_ip.ip, ip_addr) + + +class NovaException(Exception): + """ + Exception when calls to the Keystone client cannot be served properly + """ diff --git a/snaps/openstack/utils/tests/keystone_utils_tests.py b/snaps/openstack/utils/tests/keystone_utils_tests.py index ca5a0fa..fad9041 100644 --- a/snaps/openstack/utils/tests/keystone_utils_tests.py +++ b/snaps/openstack/utils/tests/keystone_utils_tests.py @@ -178,7 +178,7 @@ class KeystoneUtilsTests(OSComponentTestCase): keystone_utils.grant_user_role_to_project( self.keystone, self.role, self.user, self.project) - user_roles = keystone_utils._get_os_roles_by_user( + user_roles = keystone_utils.get_roles_by_user( self.keystone, self.user, self.project) self.assertIsNotNone(user_roles) self.assertEqual(1, len(user_roles)) diff --git a/snaps/openstack/utils/tests/neutron_utils_tests.py b/snaps/openstack/utils/tests/neutron_utils_tests.py index 3c4a24f..e0e68f6 100644 --- a/snaps/openstack/utils/tests/neutron_utils_tests.py +++ b/snaps/openstack/utils/tests/neutron_utils_tests.py @@ -24,6 +24,7 @@ from snaps.openstack.tests import validation_utils from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import keystone_utils from snaps.openstack.utils import neutron_utils +from snaps.openstack.utils.neutron_utils import NeutronException __author__ = 'spisarski' @@ -73,7 +74,7 @@ class NeutronSmokeTests(OSComponentTestCase): ext_networks = neutron_utils.get_external_networks(neutron) found = False for network in ext_networks: - if network['network']['name'] == self.ext_net_name: + if network.name == self.ext_net_name: found = True break self.assertTrue(found) @@ -390,7 +391,7 @@ class NeutronUtilsRouterTests(OSComponentTestCase): validate_subnet( self.neutron, subnet_setting.name, subnet_setting.cidr, True) - with self.assertRaises(Exception): + with self.assertRaises(NeutronException): self.interface_router = neutron_utils.add_interface_router( self.neutron, self.router, self.subnet) @@ -411,7 +412,7 @@ class NeutronUtilsRouterTests(OSComponentTestCase): validate_router(self.neutron, self.net_config.router_settings.name, True) - with self.assertRaises(Exception): + with self.assertRaises(NeutronException): self.interface_router = neutron_utils.add_interface_router( self.neutron, self.router, self.subnet) diff --git a/snaps/provisioning/ansible_utils.py b/snaps/provisioning/ansible_utils.py index b776ba0..aa1de9b 100644 --- a/snaps/provisioning/ansible_utils.py +++ b/snaps/provisioning/ansible_utils.py @@ -48,11 +48,11 @@ def apply_playbook(playbook_path, hosts_inv, host_user, ssh_priv_key_file_path, :return: the results """ if not os.path.isfile(playbook_path): - raise Exception('Requested playbook not found - ' + playbook_path) + raise AnsibleException('Requested playbook not found - ' + playbook_path) pk_file_path = os.path.expanduser(ssh_priv_key_file_path) if not os.path.isfile(pk_file_path): - raise Exception('Requested private SSH key not found - ' + + raise AnsibleException('Requested private SSH key not found - ' + pk_file_path) import ansible.constants @@ -126,3 +126,9 @@ def ssh_client(ip, user, private_key_filepath, proxy_settings=None): return ssh except Exception as e: logger.warning('Unable to connect via SSH with message - ' + str(e)) + + +class AnsibleException(Exception): + """ + Exception when calls to the Keystone client cannot be served properly + """ diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 4c8dea6..203ba33 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -225,10 +225,10 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): Should this not be performed, the creation of the host ssh key will cause your ansible calls to fail. """ - vm = self.inst_creator.create(block=True) + self.inst_creator.create(block=True) priv_ip = self.inst_creator.get_port_ip(self.port_1_name) - self.assertTrue(check_dhcp_lease(self.nova, vm, priv_ip)) + self.assertTrue(check_dhcp_lease(self.inst_creator, priv_ip)) # Apply Security Group self.inst_creator.add_security_group( @@ -277,10 +277,10 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): Should this not be performed, the creation of the host ssh key will cause your ansible calls to fail. """ - vm = self.inst_creator.create(block=True) + self.inst_creator.create(block=True) priv_ip = self.inst_creator.get_port_ip(self.port_1_name) - self.assertTrue(check_dhcp_lease(self.nova, vm, priv_ip)) + self.assertTrue(check_dhcp_lease(self.inst_creator, priv_ip)) # Apply Security Group self.inst_creator.add_security_group( |