X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=0ad877e480aabfaa434de927892039f0807981a8;hb=f86250edb1140b551886b6a184ad9963696bf72f;hp=c3b160330a7df57819f7b2fe349c4e6fee549207;hpb=07da3570c19de04f015ade251dba8412daf2e280;p=osm%2FSO.git diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index c3b16033..0ad877e4 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -1,5 +1,5 @@ -# +# # Copyright 2016 RIFT.IO Inc # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,6 +32,8 @@ from gi.repository import ( import rift.openmano.rift2openmano as rift2openmano import rift.openmano.openmano_client as openmano_client from . import rwnsmplugin +from enum import Enum + import rift.tasklets @@ -102,7 +104,6 @@ class VnfrConsoleOperdataDtsHandler(object): if action == rwdts.QueryAction.READ: schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema() path_entry = schema.keyspec_to_entry(ks_path) - self._log.debug("VDU Opdata path is {}".format(path_entry)) try: console_url = yield from self._loop.run_in_executor( @@ -130,7 +131,7 @@ class VnfrConsoleOperdataDtsHandler(object): vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur() vdur_console.id = self._vdur_id vdur_console.console_url = 'none' - + xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK, xpath=self.vnfr_vdu_console_xpath, msg=vdur_console) @@ -138,7 +139,7 @@ class VnfrConsoleOperdataDtsHandler(object): #raise VnfRecordError("Not supported operation %s" % action) self._log.error("Not supported operation %s" % action) xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK) - return + return self._log.debug("Registering for VNFR VDU using xpath: %s", self.vnfr_vdu_console_xpath) @@ -152,7 +153,7 @@ class VnfrConsoleOperdataDtsHandler(object): class OpenmanoVnfr(object): - def __init__(self, log, loop, cli_api, vnfr): + def __init__(self, log, loop, cli_api, vnfr, nsd): self._log = log self._loop = loop self._cli_api = cli_api @@ -163,6 +164,8 @@ class OpenmanoVnfr(object): self._created = False + self.nsd = nsd + @property def vnfd(self): return rift2openmano.RiftVNFD(self._vnfr.vnfd) @@ -182,7 +185,7 @@ class OpenmanoVnfr(object): @property def openmano_vnfd(self): self._log.debug("Converting vnfd %s from rift to openmano", self.vnfd.id) - openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd) + openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd, self.nsd) return openmano_vnfd @property @@ -222,7 +225,6 @@ class OpenmanoVnfr(object): self._created = True - @asyncio.coroutine def delete(self): if not self._created: return @@ -232,17 +234,30 @@ class OpenmanoVnfr(object): self._log.warning("Openmano vnf id not set. Cannot delete.") return - yield from self._loop.run_in_executor( - None, - self._cli_api.vnf_delete, - self._vnf_id, - ) + self._cli_api.vnf_delete(self._vnf_id) + + +class OpenmanoNSRecordState(Enum): + """ Network Service Record State """ + # Make sure the values match with NetworkServiceRecordState + INIT = 101 + INSTANTIATION_PENDING = 102 + RUNNING = 106 + SCALING_OUT = 107 + SCALING_IN = 108 + TERMINATE = 109 + TERMINATE_RCVD = 110 + TERMINATED = 114 + FAILED = 115 + VL_INSTANTIATE = 116 + VL_TERMINATE = 117 class OpenmanoNsr(object): - TIMEOUT_SECS = 120 + TIMEOUT_SECS = 300 + INSTANCE_TERMINATE_TIMEOUT = 60 - def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg): + def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg,key_pairs): self._dts = dts self._log = log self._loop = loop @@ -256,6 +271,7 @@ class OpenmanoNsr(object): self._vlrs = [] self._vnfrs = [] self._vdur_console_handler = {} + self._key_pairs = key_pairs self._nsd_uuid = None self._nsr_uuid = None @@ -265,6 +281,7 @@ class OpenmanoNsr(object): self._created = False self._monitor_task = None + self._state = OpenmanoNSRecordState.INIT @property def nsd(self): @@ -274,6 +291,10 @@ class OpenmanoNsr(object): def vnfds(self): return {v.rift_vnfd_id: v.vnfd for v in self._vnfrs} + @property + def vnfr_ids(self): + return {v.rift_vnfd_id: v.openmano_vnfd_id for v in self._vnfrs} + @property def vnfrs(self): return self._vnfrs @@ -281,9 +302,50 @@ class OpenmanoNsr(object): @property def openmano_nsd_yaml(self): self._log.debug("Converting nsd %s from rift to openmano", self.nsd.id) - openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds) + openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds,self.vnfr_ids) return yaml.safe_dump(openmano_nsd, default_flow_style=False) + def get_ssh_key_pairs(self): + cloud_config = {} + key_pairs = list() + for authorized_key in self._nsr_config_msg.ssh_authorized_key: + self._log.debug("Key pair ref present is %s",authorized_key.key_pair_ref) + if authorized_key.key_pair_ref in self._key_pairs: + key_pairs.append(self._key_pairs[authorized_key.key_pair_ref].key) + + for authorized_key in self._nsd_msg.key_pair: + self._log.debug("Key pair NSD is %s",authorized_key) + key_pairs.append(authorized_key.key) + + if key_pairs: + cloud_config["key-pairs"] = key_pairs + + users = list() + for user_entry in self._nsr_config_msg.user: + self._log.debug("User present is %s",user_entry) + user = {} + user["name"] = user_entry.name + user["key-pairs"] = list() + for ssh_key in user_entry.ssh_authorized_key: + if ssh_key.key_pair_ref in self._key_pairs: + user["key-pairs"].append(self._key_pairs[ssh_key.key_pair_ref].key) + users.append(user) + + for user_entry in self._nsd_msg.user: + self._log.debug("User present in NSD is %s",user_entry) + user = {} + user["name"] = user_entry.name + user["key-pairs"] = list() + for ssh_key in user_entry.key_pair: + user["key-pairs"].append(ssh_key.key) + users.append(user) + + if users: + cloud_config["users"] = users + + self._log.debug("Cloud config formed is %s",cloud_config) + return cloud_config + @property def openmano_instance_create_yaml(self): @@ -292,13 +354,17 @@ class OpenmanoNsr(object): openmano_instance_create["name"] = self._nsr_config_msg.name openmano_instance_create["description"] = self._nsr_config_msg.description openmano_instance_create["scenario"] = self._nsd_uuid + + cloud_config = self.get_ssh_key_pairs() + if cloud_config: + openmano_instance_create["cloud-config"] = cloud_config if self._nsr_config_msg.has_field("om_datacenter"): openmano_instance_create["datacenter"] = self._nsr_config_msg.om_datacenter openmano_instance_create["vnfs"] = {} for vnfr in self._vnfrs: if "om_datacenter" in vnfr.vnfr.vnfr_msg: vnfr_name = vnfr.vnfr.vnfd.name + "__" + str(vnfr.vnfr.vnfr_msg.member_vnf_index_ref) - openmano_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.om_datacenter} + openmano_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.om_datacenter} openmano_instance_create["networks"] = {} for vld_msg in self._nsd_msg.vld: openmano_instance_create["networks"][vld_msg.name] = {} @@ -323,7 +389,7 @@ class OpenmanoNsr(object): if ip_profile_params.has_field('gateway_address'): ip_profile['gateway-address'] = ip_profile_params.gateway_address if ip_profile_params.has_field('dns_server') and len(ip_profile_params.dns_server) > 0: - ip_profile['dns-address'] = ip_profile_params.dns_server[0] + ip_profile['dns-address'] = ip_profile_params.dns_server[0].address if ip_profile_params.has_field('dhcp_params'): ip_profile['dhcp'] = {} ip_profile['dhcp']['enabled'] = ip_profile_params.dhcp_params.enabled @@ -338,40 +404,58 @@ class OpenmanoNsr(object): elif "datacenter" in openmano_instance_create: network["datacenter"] = openmano_instance_create["datacenter"] if network: - openmano_instance_create["networks"][vld_msg.name]["sites"].append(network) + openmano_instance_create["networks"][vld_msg.name]["sites"].append(network) if ip_profile: - openmano_instance_create["networks"][vld_msg.name]['ip-profile'] = ip_profile - - return yaml.safe_dump(openmano_instance_create, default_flow_style=False) + openmano_instance_create["networks"][vld_msg.name]['ip-profile'] = ip_profile + + return yaml.safe_dump(openmano_instance_create, default_flow_style=False,width=1000) @asyncio.coroutine def add_vlr(self, vlr): self._vlrs.append(vlr) + yield from self._publisher.publish_vlr(None, vlr.vlr_msg) + yield from asyncio.sleep(1, loop=self._loop) + + @asyncio.coroutine + def remove_vlr(self, vlr): + if vlr in self._vlrs: + self._vlrs.remove(vlr) + yield from self._publisher.unpublish_vlr(None, vlr.vlr_msg) + yield from asyncio.sleep(1, loop=self._loop) + + @asyncio.coroutine + def delete_vlr(self, vlr): + if vlr in self._vlrs: + self._vlrs.remove(vlr) + if not vlr.vld_msg.vim_network_name: + yield from self._loop.run_in_executor( + None, + self._cli_api.ns_vim_network_delete, + vlr.name, + vlr.om_datacenter_name) + yield from self._publisher.unpublish_vlr(None, vlr.vlr_msg) yield from asyncio.sleep(1, loop=self._loop) @asyncio.coroutine def add_vnfr(self, vnfr): - vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, vnfr) + vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, vnfr, nsd=self.nsd) yield from vnfr.create() self._vnfrs.append(vnfr) - @asyncio.coroutine def delete(self): if not self._created: self._log.debug("NSD wasn't created. Skipping delete.") return self._log.debug("Deleting openmano nsr") - - yield from self._loop.run_in_executor( - None, - self._cli_api.ns_delete, - self._nsd_uuid, - ) + self._cli_api.ns_delete(self._nsd_uuid) self._log.debug("Deleting openmano vnfrs") + deleted_vnf_id_list = [] for vnfr in self._vnfrs: - yield from vnfr.delete() + if vnfr.vnfr.vnfd.id not in deleted_vnf_id_list: + vnfr.delete() + deleted_vnf_id_list.append(vnfr.vnfr.vnfd.id) @asyncio.coroutine @@ -467,6 +551,11 @@ class OpenmanoNsr(object): return vnf["ip_address"].strip() return None + def get_vnf_mac_address(vnf): + if "mac_address" in vnf: + return vnf["mac_address"].strip() + return None + def get_ext_cp_info(vnf): cp_info_list = [] for vm in vnf["vms"]: @@ -484,7 +573,11 @@ class OpenmanoNsr(object): if ip_address is None: ip_address = "0.0.0.0" - cp_info_list.append((intf["external_name"], ip_address)) + mac_address = intf["mac_address"] + if mac_address is None: + mac_address="00:00:00:00:00:00" + + cp_info_list.append((intf["external_name"], ip_address, mac_address)) return cp_info_list @@ -517,6 +610,7 @@ class OpenmanoNsr(object): self._log.debug("Found VNF status: %s", vnf_status) if vnf_status is None: self._log.error("Could not find VNF status from openmano") + self._state = OpenmanoNSRecordState.FAILED vnfr_msg.operational_status = "failed" yield from self._publisher.publish_vnfr(None, vnfr_msg) return @@ -524,12 +618,21 @@ class OpenmanoNsr(object): # If there was a VNF that has a errored VM, then just fail the VNF and stop monitoring. if any_vms_error(vnf_status): self._log.debug("VM was found to be in error state. Marking as failed.") + self._state = OpenmanoNSRecordState.FAILED + vnfr_msg.operational_status = "failed" + yield from self._publisher.publish_vnfr(None, vnfr_msg) + return + + if (time.time() - start_time) > OpenmanoNsr.TIMEOUT_SECS: + self._log.error("NSR timed out before reaching running state") + self._state = OpenmanoNSRecordState.FAILED vnfr_msg.operational_status = "failed" yield from self._publisher.publish_vnfr(None, vnfr_msg) return if all_vms_active(vnf_status): vnf_ip_address = get_vnf_ip_address(vnf_status) + vnf_mac_address = get_vnf_mac_address(vnf_status) if vnf_ip_address is None: self._log.warning("No IP address obtained " @@ -540,46 +643,43 @@ class OpenmanoNsr(object): self._log.debug("All VMs in VNF are active. Marking as running.") vnfr_msg.operational_status = "running" - self._log.debug("Got VNF ip address: %s", vnf_ip_address) + self._log.debug("Got VNF ip address: %s, mac-address: %s", vnf_ip_address, vnf_mac_address) vnfr_msg.mgmt_interface.ip_address = vnf_ip_address vnfr_msg.vnf_configuration.config_access.mgmt_ip_address = vnf_ip_address for vm in vnf_status["vms"]: if vm["uuid"] not in self._vdur_console_handler: - vdur_console_handler = VnfrConsoleOperdataDtsHandler(self._dts, self._log, self._loop, + vdur_console_handler = VnfrConsoleOperdataDtsHandler(self._dts, self._log, self._loop, self, vnfr_msg.id,vm["uuid"],vm["name"]) yield from vdur_console_handler.register() self._vdur_console_handler[vm["uuid"]] = vdur_console_handler - + vdur_msg = vnfr_msg.vdur.add() vdur_msg.vim_id = vm["vim_vm_id"] vdur_msg.id = vm["uuid"] # Add connection point information for the config manager cp_info_list = get_ext_cp_info(vnf_status) - for (cp_name, cp_ip) in cp_info_list: + for (cp_name, cp_ip, cp_mac_addr) in cp_info_list: cp = vnfr_msg.connection_point.add() cp.name = cp_name cp.short_name = cp_name cp.ip_address = cp_ip + cp.mac_address = cp_mac_addr yield from self._publisher.publish_vnfr(None, vnfr_msg) active_vnfs.append(vnfr) - if (time.time() - start_time) > OpenmanoNsr.TIMEOUT_SECS: - self._log.error("NSR timed out before reaching running state") - vnfr_msg.operational_status = "failed" - yield from self._publisher.publish_vnfr(None, vnfr_msg) - return - except Exception as e: vnfr_msg.operational_status = "failed" + self._state = OpenmanoNSRecordState.FAILED yield from self._publisher.publish_vnfr(None, vnfr_msg) self._log.exception("Caught exception publishing vnfr info: %s", str(e)) return if len(active_vnfs) == len(self._vnfrs): + self._state = OpenmanoNSRecordState.RUNNING self._log.info("All VNF's are active. Exiting NSR monitoring task") return @@ -611,32 +711,73 @@ class OpenmanoNsr(object): self._cli_api.ns_instance_scenario_create, self.openmano_instance_create_yaml) + self._state = OpenmanoNSRecordState.INSTANTIATION_PENDING self._monitor_task = asyncio.ensure_future( self.instance_monitor_task(), loop=self._loop ) - @asyncio.coroutine def terminate(self): - - for _,handler in self._vdur_console_handler.items(): - handler._regh.deregister() - if self._nsr_uuid is None: - self._log.warning("Cannot terminate an un-instantiated nsr") - return + start_time = time.time() + while ((time.time() - start_time) < OpenmanoNsr.INSTANCE_TERMINATE_TIMEOUT) and (self._nsr_uuid is None): + time.sleep(5) + self._log.warning("Waiting for nsr to get instatiated") + if self._nsr_uuid is None: + self._log.warning("Cannot terminate an un-instantiated nsr") + return if self._monitor_task is not None: self._monitor_task.cancel() self._monitor_task = None self._log.debug("Terminating openmano nsr") - yield from self._loop.run_in_executor( - None, - self._cli_api.ns_terminate, - self._nsr_uuid, - ) + self._cli_api.ns_terminate(self._nsr_uuid) + @asyncio.coroutine + def create_vlr(self,vlr): + self._log.debug("Creating openmano vim network VLR name %s, VLR DC: %s",vlr.vld_msg.name, + vlr.om_datacenter_name) + net_create = {} + net = {} + net['name'] = vlr.name + net['shared'] = True + net['type'] = 'bridge' + self._log.debug("Received ip profile is %s",vlr._ip_profile) + if vlr._ip_profile and vlr._ip_profile.has_field("ip_profile_params"): + ip_profile_params = vlr._ip_profile.ip_profile_params + ip_profile = {} + if ip_profile_params.ip_version == "ipv6": + ip_profile['ip_version'] = "IPv6" + else: + ip_profile['ip_version'] = "IPv4" + if ip_profile_params.has_field('subnet_address'): + ip_profile['subnet_address'] = ip_profile_params.subnet_address + if ip_profile_params.has_field('gateway_address'): + ip_profile['gateway_address'] = ip_profile_params.gateway_address + if ip_profile_params.has_field('dns_server') and len(ip_profile_params.dns_server) > 0: + ip_profile['dns_address'] = ip_profile_params.dns_server[0].address + if ip_profile_params.has_field('dhcp_params'): + ip_profile['dhcp_enabled'] = ip_profile_params.dhcp_params.enabled + ip_profile['dhcp_start_address'] = ip_profile_params.dhcp_params.start_address + ip_profile['dhcp_count'] = ip_profile_params.dhcp_params.count + net['ip_profile'] = ip_profile + net_create["network"]= net + + net_create_msg = yaml.safe_dump(net_create,default_flow_style=False) + fpath = dump_openmano_descriptor( + "{}_vim_net_create_{}".format(self._nsr_config_msg.name,vlr.name), + net_create_msg) + self._log.debug("Dumped Openmano VIM Net create to: %s", fpath) + + vim_network_uuid = yield from self._loop.run_in_executor( + None, + self._cli_api.ns_vim_network_create, + net_create_msg, + vlr.om_datacenter_name) + self._vlrs.append(vlr) + + class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): """ @@ -651,6 +792,7 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): self._cli_api = None self._http_api = None self._openmano_nsrs = {} + self._vnfr_uptime_tasks = {} self._set_ro_account(ro_account) @@ -670,7 +812,16 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): ro_account.openmano.tenant_id, ) - def create_nsr(self, nsr_config_msg, nsd_msg): + def set_state(self, nsr_id, state): + # Currently we update only during terminate to + # decide how to handle VL terminate + if state.value == OpenmanoNSRecordState.TERMINATE.value: + self._openmano_nsrs[nsr_id]._state = \ + [member.value for name, member in \ + OpenmanoNSRecordState.__members__.items() \ + if member.value == state.value] + + def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None): """ Create Network service record """ @@ -682,7 +833,8 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): self._cli_api, self._http_api, nsd_msg, - nsr_config_msg + nsr_config_msg, + key_pairs ) self._openmano_nsrs[nsr_config_msg.id] = openmano_nsr @@ -716,6 +868,18 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): self._log.debug("Attempting to publish openmano vnf: %s", vnfr_msg) with self._dts.transaction() as xact: yield from self._publisher.publish_vnfr(xact, vnfr_msg) + self._log.debug("Creating a task to update uptime for vnfr: %s", vnfr.id) + self._vnfr_uptime_tasks[vnfr.id] = self._loop.create_task(self.vnfr_uptime_update(vnfr)) + + def vnfr_uptime_update(self, vnfr): + try: + vnfr_ = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict({'id': vnfr.id}) + while True: + vnfr_.uptime = int(time.time()) - vnfr._create_time + yield from self._publisher.publish_vnfr(None, vnfr_) + yield from asyncio.sleep(2, loop=self._loop) + except asyncio.CancelledError: + self._log.debug("Received cancellation request for vnfr_uptime_update task") @asyncio.coroutine def instantiate_vl(self, nsr, vlr): @@ -724,7 +888,11 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): """ self._log.debug("Received instantiate VL for NSR {}; VLR {}".format(nsr.id,vlr)) openmano_nsr = self._openmano_nsrs[nsr.id] - yield from openmano_nsr.add_vlr(vlr) + if openmano_nsr._state == OpenmanoNSRecordState.RUNNING: + yield from openmano_nsr.create_vlr(vlr) + yield from self._publisher.publish_vlr(None, vlr.vlr_msg) + else: + yield from openmano_nsr.add_vlr(vlr) @asyncio.coroutine def terminate_ns(self, nsr): @@ -733,8 +901,15 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): """ nsr_id = nsr.id openmano_nsr = self._openmano_nsrs[nsr_id] - yield from openmano_nsr.terminate() - yield from openmano_nsr.delete() + + for _,handler in openmano_nsr._vdur_console_handler.items(): + handler._regh.deregister() + + yield from self._loop.run_in_executor( + None, + self.terminate, + openmano_nsr, + ) with self._dts.transaction() as xact: for vnfr in openmano_nsr.vnfrs: @@ -743,17 +918,26 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): del self._openmano_nsrs[nsr_id] + def terminate(self, openmano_nsr): + openmano_nsr.terminate() + openmano_nsr.delete() + @asyncio.coroutine def terminate_vnf(self, vnfr): """ Terminate the network service """ - pass + if vnfr.id in self._vnfr_uptime_tasks: + self._vnfr_uptime_tasks[vnfr.id].cancel() @asyncio.coroutine def terminate_vl(self, vlr): """ Terminate the virtual link """ - pass - + self._log.debug("Received terminate VL for VLR {}".format(vlr)) + openmano_nsr = self._openmano_nsrs[vlr._nsr_id] + if openmano_nsr._state == OpenmanoNSRecordState.RUNNING: + yield from openmano_nsr.delete_vlr(vlr) + else: + yield from openmano_nsr.remove_vlr(vlr)