From: Suresh Balakrishnan Date: Sun, 11 Sep 2016 09:33:19 +0000 (-0400) Subject: Bug 36 Multi site NS support and support for IP profile params X-Git-Tag: v1.0.0~34 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F304%2F1;p=osm%2FSO.git Bug 36 Multi site NS support and support for IP profile params Change-Id: I6dd7ba6634d93689d9057a9cb8a27b1ec1bae4f3 Signed-off-by: Suresh Balakrishnan --- diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py index a98335bd..275d41d2 100755 --- a/models/openmano/python/rift/openmano/rift2openmano.py +++ b/models/openmano/python/rift/openmano/rift2openmano.py @@ -270,7 +270,8 @@ def rift2openmano_nsd(rift_nsd, rift_vnfds): topology["connections"][vld.name] = {} topology["connections"][vld.name]["nodes"] = [] - if vld.vim_network_name: + #if vld.vim_network_name: + if True: if vld.name not in topology["nodes"]: topology["nodes"][vld.name] = { "type": "external_network", diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang index 2e12788e..78c86ad3 100644 --- a/models/plugins/yang/nsr.yang +++ b/models/plugins/yang/nsr.yang @@ -148,9 +148,7 @@ module nsr leaf nsd-ref { description "Reference to NSR ID ref"; mandatory true; - type leafref { - path "/nsd:nsd-catalog/nsd:nsd/nsd:id"; - } + type string; } uses ns-instance-config-params; } diff --git a/models/plugins/yang/rw-vlr.yang b/models/plugins/yang/rw-vlr.yang index 739dbec6..bbfd616e 100644 --- a/models/plugins/yang/rw-vlr.yang +++ b/models/plugins/yang/rw-vlr.yang @@ -56,6 +56,15 @@ module rw-vlr path "/rwcloud:cloud/rwcloud:account/rwcloud:name"; } } + leaf om-datacenter { + description + "Openmano datacenter name to use when instantiating + the network service. This is only used when openmano + is selected as the cloud account. This should be superceded + by multiple cloud accounts when that becomes available."; + type string; + } + leaf network_pool { description "The network pool the resource was allocated from."; diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index c9420039..d3b86a6a 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -253,12 +253,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 @@ -291,17 +294,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.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 +373,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 +584,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 +599,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 +688,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 +722,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): diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py index de21b5c5..bb217672 100755 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py @@ -460,7 +460,7 @@ class VirtualLinkRecord(object): """ Virtual Link Records class""" @staticmethod @asyncio.coroutine - def create_record(dts, log, loop, nsr_name, vld_msg, cloud_account_name, ip_profile, nsr_id, restart_mode=False): + def create_record(dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id, restart_mode=False): """Creates a new VLR object based on the given data. If restart mode is enabled, then we look for existing records in the @@ -476,6 +476,7 @@ class VirtualLinkRecord(object): nsr_name, vld_msg, cloud_account_name, + om_datacenter, ip_profile, nsr_id, ) @@ -498,13 +499,14 @@ class VirtualLinkRecord(object): return vlr_obj - def __init__(self, dts, log, loop, nsr_name, vld_msg, cloud_account_name, ip_profile, nsr_id): + def __init__(self, dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id): self._dts = dts self._log = log self._loop = loop self._nsr_name = nsr_name self._vld_msg = vld_msg self._cloud_account_name = cloud_account_name + self._om_datacenter_name = om_datacenter self._assigned_subnet = None self._nsr_id = nsr_id self._ip_profile = ip_profile @@ -556,6 +558,11 @@ class VirtualLinkRecord(object): """ Cloud account that this VLR should be created in """ return self._cloud_account_name + @property + def om_datacenter_name(self): + """ Datacenter that this VLR should be created in """ + return self._om_datacenter_name + @staticmethod def vlr_xpath(vlr): """ Get the VLR path from VLR """ @@ -600,6 +607,7 @@ class VirtualLinkRecord(object): "vld_ref": self.vld_msg.id, "name": self.name, "cloud_account": self.cloud_account_name, + "om_datacenter": self.om_datacenter_name, } if self._ip_profile and self._ip_profile.has_field('ip_profile_params'): @@ -618,12 +626,14 @@ class VirtualLinkRecord(object): nsr_vlr.vlr_ref = self._vlr_id nsr_vlr.assigned_subnet = self.assigned_subnet nsr_vlr.cloud_account = self.cloud_account_name + nsr_vlr.om_datacenter = self.om_datacenter_name for conn in self.vld_msg.vnfd_connection_point_ref: for vnfr in vnfrs: if (vnfr.vnfd.id == conn.vnfd_id_ref and vnfr.member_vnf_index == conn.member_vnf_index_ref and - self.cloud_account_name == vnfr.cloud_account_name): + self.cloud_account_name == vnfr.cloud_account_name and + self.om_datacenter_name == vnfr.om_datacenter_name): cp_entry = nsr_vlr.vnfr_connection_point_ref.add() cp_entry.vnfr_id = vnfr.id cp_entry.connection_point = conn.vnfd_connection_point_ref @@ -712,7 +722,7 @@ class VirtualNetworkFunctionRecord(object): @staticmethod @asyncio.coroutine def create_record(dts, log, loop, vnfd, const_vnfd_msg, nsd_id, nsr_name, - cloud_account_name, nsr_id, group_name, group_instance_id, + cloud_account_name, om_datacenter_name, nsr_id, group_name, group_instance_id, placement_groups, restart_mode=False): """Creates a new VNFR object based on the given data. @@ -731,6 +741,7 @@ class VirtualNetworkFunctionRecord(object): nsd_id, nsr_name, cloud_account_name, + om_datacenter_name, nsr_id, group_name, group_instance_id, @@ -761,6 +772,7 @@ class VirtualNetworkFunctionRecord(object): nsd_id, nsr_name, cloud_account_name, + om_datacenter_name, nsr_id, group_name=None, group_instance_id=None, @@ -775,6 +787,7 @@ class VirtualNetworkFunctionRecord(object): self._nsr_name = nsr_name self._nsr_id = nsr_id self._cloud_account_name = cloud_account_name + self._om_datacenter_name = om_datacenter_name self._group_name = group_name self._group_instance_id = group_instance_id self._placement_groups = placement_groups @@ -816,7 +829,7 @@ class VirtualNetworkFunctionRecord(object): @property def const_vnfr_msg(self): """ VNFR message """ - return RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ConstituentVnfrRef(vnfr_id=self.id,cloud_account=self.cloud_account_name) + return RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ConstituentVnfrRef(vnfr_id=self.id,cloud_account=self.cloud_account_name,om_datacenter=self._om_datacenter_name) @property def vnfd(self): @@ -828,6 +841,11 @@ class VirtualNetworkFunctionRecord(object): """ Cloud account that this VNF should be created in """ return self._cloud_account_name + @property + def om_datacenter_name(self): + """ Datacenter that this VNF should be created in """ + return self._om_datacenter_name + @property def active(self): @@ -933,6 +951,7 @@ class VirtualNetworkFunctionRecord(object): "vnfd_ref": self.vnfd.id, "name": self.name, "cloud_account": self._cloud_account_name, + "om_datacenter": self._om_datacenter_name, "config_status": self.config_status } vnfr_dict.update(vnfd_copy_dict) @@ -1283,6 +1302,12 @@ class NetworkServiceRecord(object): def cloud_account_name(self): return self._nsr_cfg_msg.cloud_account + @property + def om_datacenter_name(self): + if self._nsr_cfg_msg.has_field('om_datacenter'): + return self._nsr_cfg_msg.om_datacenter + return None + @property def state(self): """State of this NetworkServiceRecord""" @@ -1380,11 +1405,11 @@ class NetworkServiceRecord(object): def _get_vnfd_cloud_account(self, vnfd_member_index): """ Fetch Cloud Account for the passed vnfd id """ if self._nsr_cfg_msg.vnf_cloud_account_map: - vim_accounts = [vnf.cloud_account for vnf in self._nsr_cfg_msg.vnf_cloud_account_map \ + vim_accounts = [(vnf.cloud_account,vnf.om_datacenter) for vnf in self._nsr_cfg_msg.vnf_cloud_account_map \ if vnfd_member_index == vnf.member_vnf_index_ref] if vim_accounts and vim_accounts[0]: return vim_accounts[0] - return self.cloud_account_name + return (self.cloud_account_name,self.om_datacenter_name) def _get_constituent_vnfd_msg(self, vnf_index): for const_vnfd in self.nsd_msg.constituent_vnfd: @@ -1644,11 +1669,11 @@ class NetworkServiceRecord(object): const_vnfd_msg = self._get_constituent_vnfd_msg(vnf_index) vnfd_msg = self._get_vnfd(const_vnfd_msg.vnfd_id_ref, config_xact) - cloud_account_name = self._get_vnfd_cloud_account(const_vnfd_msg.member_vnf_index) + cloud_account_name, om_datacenter_name = self._get_vnfd_cloud_account(const_vnfd_msg.member_vnf_index) if cloud_account_name is None: cloud_account_name = self.cloud_account_name for _ in range(count): - vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, group_name, index) + vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, om_datacenter_name, group_name, index) scale_instance.add_vnfr(vnfr) vnfrs.append(vnfr) @@ -1785,7 +1810,7 @@ class NetworkServiceRecord(object): return profile[0] if profile else None @asyncio.coroutine - def _create_vls(self, vld, cloud_account): + def _create_vls(self, vld, cloud_account,om_datacenter): """Create a VLR in the cloud account specified using the given VLD Args: @@ -1802,6 +1827,7 @@ class NetworkServiceRecord(object): self.name, vld, cloud_account, + om_datacenter, self.resolve_vld_ip_profile(self.nsd_msg, vld), self.id, restart_mode=self.restart_mode) @@ -1826,25 +1852,28 @@ class NetworkServiceRecord(object): # Handle case where cloud_account is None vnf_cloud_map = {} for vnf in self._nsr_cfg_msg.vnf_cloud_account_map: - if vnf.cloud_account is not None: - vnf_cloud_map[vnf.member_vnf_index_ref] = vnf.cloud_account + if vnf.cloud_account is not None or vnf.om_datacenter is not None: + vnf_cloud_map[vnf.member_vnf_index_ref] = (vnf.cloud_account,vnf.om_datacenter) for vnfc in vld.vnfd_connection_point_ref: cloud_account = vnf_cloud_map.get( vnfc.member_vnf_index_ref, - self.cloud_account_name) + (self.cloud_account_name,self.om_datacenter_name)) cloud_account_list.append(cloud_account) if self._nsr_cfg_msg.vl_cloud_account_map: for vld_map in self._nsr_cfg_msg.vl_cloud_account_map: if vld_map.vld_id_ref == vld.id: - cloud_account_list.extend(vld_map.cloud_accounts) + for cloud_account in vld_map.cloud_accounts: + cloud_account_list.extend((cloud_account,None)) + for om_datacenter in vld_map.om_datacenters: + cloud_account_list.extend((None,om_datacenter)) # If no config has been provided then fall-back to the default # account if not cloud_account_list: - cloud_account_list = [self.cloud_account_name] + cloud_account_list = [(self.cloud_account_name,self.om_datacenter_name)] self._log.debug("VL {} cloud accounts: {}". format(vld.name, cloud_account_list)) @@ -1857,8 +1886,8 @@ class NetworkServiceRecord(object): for vld in self.nsd_msg.vld: self._log.debug("Found vld %s in nsr id %s", vld, self.id) cloud_account_list = self._extract_cloud_accounts_for_vl(vld) - for account in cloud_account_list: - vlr = yield from self._create_vls(vld, account) + for cloud_account,om_datacenter in cloud_account_list: + vlr = yield from self._create_vls(vld, cloud_account,om_datacenter) self._vlrs.append(vlr) @@ -1941,10 +1970,10 @@ class NetworkServiceRecord(object): continue vnfd_msg = self._get_vnfd(const_vnfd.vnfd_id_ref, config_xact) - cloud_account_name = self._get_vnfd_cloud_account(const_vnfd.member_vnf_index) + cloud_account_name,om_datacenter_name = self._get_vnfd_cloud_account(const_vnfd.member_vnf_index) if cloud_account_name is None: cloud_account_name = self.cloud_account_name - yield from self.create_vnf_record(vnfd_msg, const_vnfd, cloud_account_name) + yield from self.create_vnf_record(vnfd_msg, const_vnfd, cloud_account_name, om_datacenter_name) def get_placement_groups(self, vnfd_msg, const_vnfd): @@ -1966,7 +1995,7 @@ class NetworkServiceRecord(object): return placement_groups @asyncio.coroutine - def create_vnf_record(self, vnfd_msg, const_vnfd, cloud_account_name, group_name=None, group_instance_id=None): + def create_vnf_record(self, vnfd_msg, const_vnfd, cloud_account_name, om_datacenter_name, group_name=None, group_instance_id=None): # Fetch the VNFD associated with this VNF placement_groups = self.get_placement_groups(vnfd_msg, const_vnfd) self._log.info("Cloud Account for VNF %d is %s",const_vnfd.member_vnf_index,cloud_account_name) @@ -1982,6 +2011,7 @@ class NetworkServiceRecord(object): self.nsd_id, self.name, cloud_account_name, + om_datacenter_name, self.id, group_name, group_instance_id,