X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=17a13a390dfa1f417972b4468603c315dd1a6303;hb=699e14141627d8f8fd30abc07c87c1e081215762;hp=c9420039e182ff6e29321ad7ff9b848b188d38e4;hpb=6f07e6f33f751ab4ffe624f6037f887b243bece2;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 c9420039..17a13a39 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -102,7 +102,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( @@ -253,12 +252,15 @@ class OpenmanoNsr(object): self._nsd_msg = nsd_msg self._nsr_config_msg = nsr_config_msg + self._vlrs = [] self._vnfrs = [] self._vdur_console_handler = {} self._nsd_uuid = None self._nsr_uuid = None + self._nsr_msg = None + self._created = False self._monitor_task = None @@ -271,6 +273,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 @@ -278,7 +284,7 @@ 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) @@ -291,17 +297,60 @@ class OpenmanoNsr(object): openmano_instance_create["scenario"] = self._nsd_uuid 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["networks"] = {} for vld_msg in self._nsd_msg.vld: - if vld_msg.vim_network_name: - network = {} - network["name"] = vld_msg.name - network["netmap-use"] = vld_msg.vim_network_name - #network["datacenter"] = vld_msg.om_datacenter - openmano_instance_create["networks"][vld_msg.name] = network + openmano_instance_create["networks"][vld_msg.name] = {} + openmano_instance_create["networks"][vld_msg.name]["sites"] = list() + for vlr in self._vlrs: + if vlr.vld_msg.name == vld_msg.name: + self._log.debug("Received VLR name %s, VLR DC: %s for VLD: %s",vlr.vld_msg.name, + vlr.om_datacenter_name,vld_msg.name) + #network["vim-network-name"] = vld_msg.name + network = {} + ip_profile = {} + if vld_msg.vim_network_name: + network["netmap-use"] = vld_msg.vim_network_name + elif vlr._ip_profile and vlr._ip_profile.has_field("ip_profile_params"): + ip_profile_params = vlr._ip_profile.ip_profile_params + 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] + if ip_profile_params.has_field('dhcp_params'): + ip_profile['dhcp'] = {} + 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 + else: + network["netmap-create"] = vlr.name + if vlr.om_datacenter_name: + network["datacenter"] = vlr.om_datacenter_name + elif vld_msg.has_field("om_datacenter"): + network["datacenter"] = vld_msg.om_datacenter + elif "datacenter" in openmano_instance_create: + network["datacenter"] = openmano_instance_create["datacenter"] + if 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) + @asyncio.coroutine + def add_vlr(self, vlr): + self._vlrs.append(vlr) + yield from asyncio.sleep(1, loop=self._loop) @asyncio.coroutine def add_vnfr(self, vnfr): @@ -327,6 +376,7 @@ class OpenmanoNsr(object): for vnfr in self._vnfrs: yield from vnfr.delete() + @asyncio.coroutine def create(self): self._log.debug("Creating openmano scenario") @@ -537,7 +587,7 @@ class OpenmanoNsr(object): return @asyncio.coroutine - def deploy(self): + def deploy(self,nsr_msg): if self._nsd_uuid is None: raise ValueError("Cannot deploy an uncreated nsd") @@ -552,18 +602,18 @@ class OpenmanoNsr(object): self._log.debug("Found existing instance with nsr name: %s", self._nsr_config_msg.name) self._nsr_uuid = name_uuid_map[self._nsr_config_msg.name] else: - self._nsr_uuid = yield from self._loop.run_in_executor( - None, - self._cli_api.ns_instance_scenario_create, - self.openmano_instance_create_yaml) - + self._nsr_msg = nsr_msg fpath = dump_openmano_descriptor( "{}_instance_sce_create".format(self._nsr_config_msg.name), self.openmano_instance_create_yaml, ) - self._log.debug("Dumped Openmano NS Scenario Cretae to: %s", fpath) + self._nsr_uuid = yield from self._loop.run_in_executor( + None, + self._cli_api.ns_instance_scenario_create, + self.openmano_instance_create_yaml) + self._monitor_task = asyncio.ensure_future( self.instance_monitor_task(), loop=self._loop @@ -641,9 +691,10 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): @asyncio.coroutine def deploy(self, nsr_msg): + self._log.debug("Received NSR Deploy msg : %s", nsr_msg) openmano_nsr = self._openmano_nsrs[nsr_msg.ns_instance_config_ref] yield from openmano_nsr.create() - yield from openmano_nsr.deploy() + yield from openmano_nsr.deploy(nsr_msg) @asyncio.coroutine def instantiate_ns(self, nsr, xact): @@ -674,7 +725,9 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): """ Instantiate NSR with the passed nsr id """ - pass + 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) @asyncio.coroutine def terminate_ns(self, nsr):