X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Ftango%2Fllcm.py;h=174bcf880dbba44eb9553437e77ca23ba379fa3e;hb=9467ee52a690736ff222280b11420e4c2104a1c6;hp=17dd175d4ce283f5b62e126a3a1e13638c21743f;hpb=20e54456216efbcca714ae7464f4cf196999b662;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/tango/llcm.py b/src/emuvim/api/tango/llcm.py index 17dd175..174bcf8 100755 --- a/src/emuvim/api/tango/llcm.py +++ b/src/emuvim/api/tango/llcm.py @@ -42,7 +42,6 @@ import flask_restful as fr from collections import defaultdict import pkg_resources from subprocess import Popen -from random import randint import ipaddress import copy import time @@ -74,7 +73,7 @@ DEPLOY_SAP = False # flag to indicate if we use bidirectional forwarding rules in the # automatic chaining process -BIDIRECTIONAL_CHAIN = False +BIDIRECTIONAL_CHAIN = True # override the management interfaces in the descriptors with default # docker0 interfaces in the containers @@ -98,12 +97,12 @@ def generate_subnets(prefix, base, subnet_size=50, mask=24): # private subnet definitions for the generated interfaces -# 10.10.xxx.0/24 -SAP_SUBNETS = generate_subnets('10.10', 0, subnet_size=50, mask=30) -# 10.20.xxx.0/30 -ELAN_SUBNETS = generate_subnets('10.20', 0, subnet_size=50, mask=24) -# 10.30.xxx.0/30 -ELINE_SUBNETS = generate_subnets('10.30', 0, subnet_size=50, mask=30) +# 99.0.xxx.0/24 +SAP_SUBNETS = generate_subnets('99.0', 0, subnet_size=50, mask=24) +# 30.0.xxx.0/24 +ELAN_SUBNETS = generate_subnets('30.0', 0, subnet_size=50, mask=24) +# 20.0.xxx.0/24 +ELINE_SUBNETS = generate_subnets('20.0', 0, subnet_size=50, mask=24) # path to the VNFD for the SAP VNF that is deployed as internal SAP point SAP_VNFD = None @@ -136,10 +135,6 @@ class Gatekeeper(object): # lets perform all steps needed to onboard the service service.onboard() - def get_next_vnf_name(self): - self.vnf_counter += 1 - return "vnf%d" % self.vnf_counter - class Service(object): """ @@ -215,20 +210,16 @@ class Service(object): # VNFDs) if not GK_STANDALONE_MODE: # self._calculate_placement(FirstDcPlacement) - self._calculate_placement(RoundRobinDcPlacementWithSAPs) - # 3. start all vnfds that we have in the service (except SAPs) + self._calculate_placement(RoundRobinDcPlacement) + # 3. start all vnfds that we have in the service for vnf_id in self.vnfds: vnfd = self.vnfds[vnf_id] - vnfi = None - if not GK_STANDALONE_MODE: - vnfi = self._start_vnfd(vnfd, vnf_id) - self.instances[instance_uuid]["vnf_instances"].append(vnfi) - - # 4. start all SAPs in the service - for sap in self.saps: - self._start_sap(self.saps[sap], instance_uuid) + # attention: returns a list of started deployment units + vnfis = self._start_vnfd(vnfd, vnf_id) + # add list of VNFIs to total VNFI list + self.instances[instance_uuid]["vnf_instances"].extend(vnfis) - # 5. Deploy E-Line and E_LAN links + # 4. Deploy E-Line, E-Tree and E-LAN links # Attention: Only done if ""forwarding_graphs" section in NSD exists, # even if "forwarding_graphs" are not used directly. if "virtual_links" in self.nsd and "forwarding_graphs" in self.nsd: @@ -238,15 +229,14 @@ class Service(object): eline_fwd_links = [l for l in vlinks if ( l["connectivity_type"] == "E-Line")] elan_fwd_links = [l for l in vlinks if ( - l["connectivity_type"] == "E-LAN")] - - GK.net.deployed_elines.extend(eline_fwd_links) - GK.net.deployed_elans.extend(elan_fwd_links) + l["connectivity_type"] == "E-LAN" or + l["connectivity_type"] == "E-Tree")] # Treat E-Tree as E-LAN # 5a. deploy E-Line links + GK.net.deployed_elines.extend(eline_fwd_links) # bookkeeping self._connect_elines(eline_fwd_links, instance_uuid) - - # 5b. deploy E-LAN links + # 5b. deploy E-Tree/E-LAN links + GK.net.deployed_elans.extend(elan_fwd_links) # bookkeeping self._connect_elans(elan_fwd_links, instance_uuid) # 6. run the emulator specific entrypoint scripts in the VNFIs of this @@ -285,13 +275,37 @@ class Service(object): LOG.info("Stopping the SAP instance: %r in DC %r" % (sap_name, target_dc)) - if not GK_STANDALONE_MODE: - # remove placement? - # self._remove_placement(RoundRobinPlacement) - None # last step: remove the instance from the list of all instances del self.instances[instance_uuid] + def _get_resource_limits(self, deployment_unit): + """ + Extract resource limits from deployment units. + """ + # defaults + cpu_list = "1" + cpu_period, cpu_quota = self._calculate_cpu_cfs_values(float(1.0)) + mem_limit = 0 + # update from descriptor + if "resource_requirements" in deployment_unit: + res_req = deployment_unit.get("resource_requirements") + cpu_list = res_req.get("cpu").get("cores") + if cpu_list is None: + cpu_list = res_req.get("cpu").get("vcpus") + cpu_bw = res_req.get("cpu").get("cpu_bw", 1.0) + cpu_period, cpu_quota = self._calculate_cpu_cfs_values(float(cpu_bw)) + mem_num = str(res_req.get("memory").get("size", 2)) + mem_unit = str(res_req.get("memory").get("size_unit", "GB")) + mem_limit = float(mem_num) + if mem_unit == "GB": + mem_limit = mem_limit * 1024 * 1024 * 1024 + elif mem_unit == "MB": + mem_limit = mem_limit * 1024 * 1024 + elif mem_unit == "KB": + mem_limit = mem_limit * 1024 + mem_limit = int(mem_limit) + return cpu_list, cpu_period, cpu_quota, mem_limit + def _start_vnfd(self, vnfd, vnf_id, **kwargs): """ Start a single VNFD of this service @@ -299,113 +313,77 @@ class Service(object): :param vnf_id: unique id of this vnf in the nsd :return: """ + vnfis = list() # the vnf_name refers to the container image to be deployed vnf_name = vnfd.get("name") - + # combine VDUs and CDUs + deployment_units = (vnfd.get("virtual_deployment_units", []) + + vnfd.get("cloudnative_deployment_units", [])) # iterate over all deployment units within each VNFDs - for u in vnfd.get("virtual_deployment_units"): - # 1. get the name of the docker image to start and the assigned DC - if vnf_id not in self.remote_docker_image_urls: - raise Exception("No image name for %r found. Abort." % vnf_id) - docker_name = self.remote_docker_image_urls.get(vnf_id) + for u in deployment_units: + # 0. vnf_container_name = vnf_id.vdu_id + vnf_container_name = get_container_name(vnf_id, u.get("id")) + # 1. get the name of the docker image to star + if vnf_container_name not in self.remote_docker_image_urls: + raise Exception("No image name for %r found. Abort." % vnf_container_name) + docker_image_name = self.remote_docker_image_urls.get(vnf_container_name) + # 2. select datacenter to start the VNF in target_dc = vnfd.get("dc") - # 2. perform some checks to ensure we can start the container - assert(docker_name is not None) + # 3. perform some checks to ensure we can start the container + assert(docker_image_name is not None) assert(target_dc is not None) - if not self._check_docker_image_exists(docker_name): - raise Exception( - "Docker image %r not found. Abort." % docker_name) + if not self._check_docker_image_exists(docker_image_name): + raise Exception("Docker image {} not found. Abort." + .format(docker_image_name)) - # 3. get the resource limits - res_req = u.get("resource_requirements") - cpu_list = res_req.get("cpu").get("cores") - if cpu_list is None: - cpu_list = res_req.get("cpu").get("vcpus") - if cpu_list is None: - cpu_list = "1" - cpu_bw = res_req.get("cpu").get("cpu_bw") - if not cpu_bw: - cpu_bw = 1 - mem_num = str(res_req.get("memory").get("size")) - if len(mem_num) == 0: - mem_num = "2" - mem_unit = str(res_req.get("memory").get("size_unit")) - if str(mem_unit) == 0: - mem_unit = "GB" - mem_limit = float(mem_num) - if mem_unit == "GB": - mem_limit = mem_limit * 1024 * 1024 * 1024 - elif mem_unit == "MB": - mem_limit = mem_limit * 1024 * 1024 - elif mem_unit == "KB": - mem_limit = mem_limit * 1024 - mem_lim = int(mem_limit) - cpu_period, cpu_quota = self._calculate_cpu_cfs_values( - float(cpu_bw)) - - # check if we need to deploy the management ports (defined as - # type:management both on in the vnfd and nsd) - intfs = vnfd.get("connection_points", []) - mgmt_intf_names = [] - if USE_DOCKER_MGMT: - mgmt_intfs = [vnf_id + ':' + intf['id'] - for intf in intfs if intf.get('type') == 'management'] - # check if any of these management interfaces are used in a - # management-type network in the nsd - for nsd_intf_name in mgmt_intfs: - vlinks = [l["connection_points_reference"] - for l in self.nsd.get("virtual_links", [])] - for link in vlinks: - if nsd_intf_name in link and self.check_mgmt_interface( - link): - # this is indeed a management interface and can be - # skipped - vnf_id, vnf_interface, vnf_sap_docker_name = parse_interface( - nsd_intf_name) - found_interfaces = [ - intf for intf in intfs if intf.get('id') == vnf_interface] - intfs.remove(found_interfaces[0]) - mgmt_intf_names.append(vnf_interface) - - # 4. generate the volume paths for the docker container + # 4. get the resource limits + cpu_list, cpu_period, cpu_quota, mem_limit = self._get_resource_limits(u) + + # get connection points defined for the DU + intfs = u.get("connection_points", []) + # do some re-naming of fields to be compatible to containernet + for i in intfs: + if i.get("address"): + i["ip"] = i.get("address") + + # 5. collect additional information to start container volumes = list() - # a volume to extract log files - docker_log_path = "/tmp/results/%s/%s" % (self.uuid, vnf_id) - LOG.debug("LOG path for vnf %s is %s." % (vnf_id, docker_log_path)) - if not os.path.exists(docker_log_path): - LOG.debug("Creating folder %s" % docker_log_path) - os.makedirs(docker_log_path) - - volumes.append(docker_log_path + ":/mnt/share/") - - # 5. do the dc.startCompute(name="foobar") call to run the container - # TODO consider flavors, and other annotations - # TODO: get all vnf id's from the nsd for this vnfd and use those as dockername - # use the vnf_id in the nsd as docker name - # so deployed containers can be easily mapped back to the nsd + cenv = dict() + # 5.1 inject descriptor based start/stop commands into env (overwrite) + VNFD_CMD_START = u.get("vm_cmd_start") + VNFD_CMD_STOP = u.get("vm_cmd_stop") + if VNFD_CMD_START and not VNFD_CMD_START == "None": + LOG.info("Found 'vm_cmd_start'='{}' in VNFD.".format(VNFD_CMD_START) + + " Overwriting SON_EMU_CMD.") + cenv["SON_EMU_CMD"] = VNFD_CMD_START + if VNFD_CMD_STOP and not VNFD_CMD_STOP == "None": + LOG.info("Found 'vm_cmd_start'='{}' in VNFD.".format(VNFD_CMD_STOP) + + " Overwriting SON_EMU_CMD_STOP.") + cenv["SON_EMU_CMD_STOP"] = VNFD_CMD_STOP + + # 6. Start the container LOG.info("Starting %r as %r in DC %r" % - (vnf_name, vnf_id, vnfd.get("dc"))) + (vnf_name, vnf_container_name, vnfd.get("dc"))) LOG.debug("Interfaces for %r: %r" % (vnf_id, intfs)) + # start the container vnfi = target_dc.startCompute( - vnf_id, + vnf_container_name, network=intfs, - image=docker_name, - flavor_name="small", + image=docker_image_name, cpu_quota=cpu_quota, cpu_period=cpu_period, cpuset=cpu_list, - mem_limit=mem_lim, + mem_limit=mem_limit, volumes=volumes, + properties=cenv, # environment type=kwargs.get('type', 'docker')) - - # rename the docker0 interfaces (eth0) to the management port name - # defined in the VNFD - if USE_DOCKER_MGMT: - for intf_name in mgmt_intf_names: - self._vnf_reconfigure_network( - vnfi, 'eth0', new_name=intf_name) - - return vnfi + # add vnfd reference to vnfi + vnfi.vnfd = vnfd + # add container name + vnfi.vnf_container_name = vnf_container_name + # store vnfi + vnfis.append(vnfi) + return vnfis def _stop_vnfi(self, vnfi): """ @@ -424,16 +402,30 @@ class Service(object): def _get_vnf_instance(self, instance_uuid, vnf_id): """ - Returns the Docker object for the given VNF id (or Docker name). - :param instance_uuid: UUID of the service instance to search in. - :param name: VNF name or Docker name. We are fuzzy here. - :return: + Returns VNFI object for a given "vnf_id" or "vnf_container_namse" taken from an NSD. + :return: single object """ - dn = vnf_id for vnfi in self.instances[instance_uuid]["vnf_instances"]: - if vnfi.name == dn: + if str(vnfi.name) == str(vnf_id): return vnfi - LOG.warning("No container with name: {0} found.".format(dn)) + LOG.warning("No container with name: {0} found.".format(vnf_id)) + return None + + def _get_vnf_instance_units(self, instance_uuid, vnf_id): + """ + Returns a list of VNFI objects (all deployment units) for a given + "vnf_id" taken from an NSD. + :return: list + """ + r = list() + for vnfi in self.instances[instance_uuid]["vnf_instances"]: + if vnf_id in vnfi.name: + r.append(vnfi) + if len(r) > 0: + LOG.debug("Found units: {} for vnf_id: {}" + .format([i.name for i in r], vnf_id)) + return r + LOG.warning("No container(s) with name: {0} found.".format(vnf_id)) return None @staticmethod @@ -471,15 +463,16 @@ class Service(object): env = config.get("Env", list()) for env_var in env: var, cmd = map(str.strip, map(str, env_var.split('=', 1))) - LOG.debug("%r = %r" % (var, cmd)) - if var == "SON_EMU_CMD": - LOG.info("Executing entry point script in %r: %r" % - (vnfi.name, cmd)) + # LOG.debug("%r = %r" % (var, cmd)) + if var == "SON_EMU_CMD" or var == "VIM_EMU_CMD": + LOG.info("Executing script in '{}': {}={}" + .format(vnfi.name, var, cmd)) # execute command in new thread to ensure that GK is not # blocked by VNF t = threading.Thread(target=vnfi.cmdPrint, args=(cmd,)) t.daemon = True t.start() + break # only execute one command def _trigger_emulator_stop_scripts_in_vnfis(self, vnfi_list): for vnfi in vnfi_list: @@ -487,14 +480,15 @@ class Service(object): env = config.get("Env", list()) for env_var in env: var, cmd = map(str.strip, map(str, env_var.split('=', 1))) - if var == "SON_EMU_CMD_STOP": - LOG.info("Executing stop script in %r: %r" % - (vnfi.name, cmd)) + if var == "SON_EMU_CMD_STOP" or var == "VIM_EMU_CMD_STOP": + LOG.info("Executing script in '{}': {}={}" + .format(vnfi.name, var, cmd)) # execute command in new thread to ensure that GK is not # blocked by VNF t = threading.Thread(target=vnfi.cmdPrint, args=(cmd,)) t.daemon = True t.start() + break # only execute one command def _unpack_service_package(self): """ @@ -642,6 +636,7 @@ class Service(object): def _connect_elines(self, eline_fwd_links, instance_uuid): """ Connect all E-LINE links in the NSD + Attention: This method DOES NOT support multi V/CDU VNFs! :param eline_fwd_links: list of E-LINE links in the NSD :param: instance_uuid of the service :return: @@ -650,6 +645,7 @@ class Service(object): # eg. different services get a unique cookie for their flowrules cookie = 1 for link in eline_fwd_links: + LOG.info("Found E-Line: {}".format(link)) # check if we need to deploy this link when its a management link: if USE_DOCKER_MGMT: if self.check_mgmt_interface( @@ -699,24 +695,34 @@ class Service(object): # Link between 2 VNFs else: + LOG.info("Creating E-Line: src={}, dst={}" + .format(src_id, dst_id)) # make sure we use the correct sap vnf name if src_sap_id in self.saps_int: src_id = src_sap_id if dst_sap_id in self.saps_int: dst_id = dst_sap_id - # re-configure the VNFs IP assignment and ensure that a new - # subnet is used for each E-Link + # get involved vnfis src_vnfi = self._get_vnf_instance(instance_uuid, src_id) dst_vnfi = self._get_vnf_instance(instance_uuid, dst_id) + if src_vnfi is not None and dst_vnfi is not None: + setChaining = True + # re-configure the VNFs IP assignment and ensure that a new + # subnet is used for each E-Link eline_net = ELINE_SUBNETS.pop(0) ip1 = "{0}/{1}".format(str(eline_net[1]), eline_net.prefixlen) ip2 = "{0}/{1}".format(str(eline_net[2]), eline_net.prefixlen) - self._vnf_reconfigure_network(src_vnfi, src_if_name, ip1) - self._vnf_reconfigure_network(dst_vnfi, dst_if_name, ip2) - setChaining = True + # check if VNFs have fixed IPs (address field in VNFDs) + if (self._get_vnfd_cp_from_vnfi(src_vnfi, src_if_name) + .get("address") is None): + self._vnf_reconfigure_network(src_vnfi, src_if_name, ip1) + # check if VNFs have fixed IPs (address field in VNFDs) + if (self._get_vnfd_cp_from_vnfi(dst_vnfi, dst_if_name) + .get("address") is None): + self._vnf_reconfigure_network(dst_vnfi, dst_if_name, ip2) # Set the chaining if setChaining: @@ -724,71 +730,64 @@ class Service(object): src_id, dst_id, vnf_src_interface=src_if_name, vnf_dst_interface=dst_if_name, bidirectional=BIDIRECTIONAL_CHAIN, cmd="add-flow", cookie=cookie, priority=10) - LOG.debug( - "Setting up E-Line link. (%s:%s) -> (%s:%s)" % ( - src_id, src_if_name, dst_id, dst_if_name)) + + def _get_vnfd_cp_from_vnfi(self, vnfi, ifname): + """ + Gets the connection point data structure from the VNFD + of the given VNFI using ifname. + """ + if vnfi.vnfd is None: + return {} + cps = vnfi.vnfd.get("connection_points") + for cp in cps: + if cp.get("id") == ifname: + return cp def _connect_elans(self, elan_fwd_links, instance_uuid): """ - Connect all E-LAN links in the NSD + Connect all E-LAN/E-Tree links in the NSD + This method supports multi-V/CDU VNFs if the connection + point names of the DUs are the same as the ones in the NSD. :param elan_fwd_links: list of E-LAN links in the NSD :param: instance_uuid of the service :return: """ for link in elan_fwd_links: - # check if we need to deploy this link when its a management link: - if USE_DOCKER_MGMT: - if self.check_mgmt_interface( - link["connection_points_reference"]): - continue - + # a new E-LAN/E-Tree elan_vnf_list = [] - # check if an external SAP is in the E-LAN (then a subnet is - # already defined) - intfs_elan = [intf for intf in link["connection_points_reference"]] - lan_sap = self.check_ext_saps(intfs_elan) - if lan_sap: - lan_net = self.saps[lan_sap]['net'] - lan_hosts = list(lan_net.hosts()) - else: - lan_net = ELAN_SUBNETS.pop(0) - lan_hosts = list(lan_net.hosts()) + lan_net = ELAN_SUBNETS.pop(0) + lan_hosts = list(lan_net.hosts()) - # generate lan ip address for all interfaces except external SAPs + # generate lan ip address for all interfaces (of all involved (V/CDUs)) for intf in link["connection_points_reference"]: - - # skip external SAPs, they already have an ip - vnf_id, vnf_interface, vnf_sap_docker_name = parse_interface( - intf) - if vnf_sap_docker_name in self.saps_ext: - elan_vnf_list.append( - {'name': vnf_sap_docker_name, 'interface': vnf_interface}) - continue - - ip_address = "{0}/{1}".format(str(lan_hosts.pop(0)), - lan_net.prefixlen) - vnf_id, intf_name, vnf_sap_id = parse_interface(intf) - - # make sure we use the correct sap vnf name - src_docker_name = vnf_id - if vnf_sap_id in self.saps_int: - src_docker_name = vnf_sap_id - vnf_id = vnf_sap_id - - LOG.debug( - "Setting up E-LAN interface. (%s:%s) -> %s" % ( - vnf_id, intf_name, ip_address)) - - # re-configure the VNFs IP assignment and ensure that a new subnet is used for each E-LAN - # E-LAN relies on the learning switch capability of Ryu which has to be turned on in the topology - # (DCNetwork(controller=RemoteController, enable_learning=True)), so no explicit chaining is necessary. - vnfi = self._get_vnf_instance(instance_uuid, vnf_id) - if vnfi is not None: - self._vnf_reconfigure_network(vnfi, intf_name, ip_address) - # add this vnf and interface to the E-LAN for tagging - elan_vnf_list.append( - {'name': src_docker_name, 'interface': intf_name}) - + vnf_id, intf_name, _ = parse_interface(intf) + if vnf_id is None: + continue # skip references to NS connection points + units = self._get_vnf_instance_units(instance_uuid, vnf_id) + if units is None: + continue # skip if no deployment unit is present + # iterate over all involved deployment units + for uvnfi in units: + # Attention: we apply a simplification for multi DU VNFs here: + # the connection points of all involved DUs have to have the same + # name as the connection points of the surrounding VNF to be mapped. + # This is because we do not consider links specified in the VNFds + container_name = uvnfi.name + ip_address = "{0}/{1}".format(str(lan_hosts.pop(0)), + lan_net.prefixlen) + LOG.debug( + "Setting up E-LAN/E-Tree interface. (%s:%s) -> %s" % ( + container_name, intf_name, ip_address)) + # re-configure the VNFs IP assignment and ensure that a new subnet is used for each E-LAN + # E-LAN relies on the learning switch capability of Ryu which has to be turned on in the topology + # (DCNetwork(controller=RemoteController, enable_learning=True)), so no explicit chaining is + # necessary. + vnfi = self._get_vnf_instance(instance_uuid, container_name) + if vnfi is not None: + self._vnf_reconfigure_network(vnfi, intf_name, ip_address) + # add this vnf and interface to the E-LAN for tagging + elan_vnf_list.append( + {'name': container_name, 'interface': intf_name}) # install the VLAN tags for this E-LAN GK.net.setLAN(elan_vnf_list) @@ -797,35 +796,50 @@ class Service(object): Get all paths to Dockerfiles from VNFDs and store them in dict. :return: """ - for k, v in self.vnfds.iteritems(): - for vu in v.get("virtual_deployment_units"): + for vnf_id, v in self.vnfds.iteritems(): + for vu in v.get("virtual_deployment_units", []): + vnf_container_name = get_container_name(vnf_id, vu.get("id")) if vu.get("vm_image_format") == "docker": vm_image = vu.get("vm_image") docker_path = os.path.join( self.package_content_path, make_relative_path(vm_image)) - self.local_docker_files[k] = docker_path - LOG.debug("Found Dockerfile (%r): %r" % (k, docker_path)) + self.local_docker_files[vnf_container_name] = docker_path + LOG.debug("Found Dockerfile (%r): %r" % (vnf_container_name, docker_path)) + for cu in v.get("cloudnative_deployment_units", []): + vnf_container_name = get_container_name(vnf_id, cu.get("id")) + image = cu.get("image") + docker_path = os.path.join( + self.package_content_path, + make_relative_path(image)) + self.local_docker_files[vnf_container_name] = docker_path + LOG.debug("Found Dockerfile (%r): %r" % (vnf_container_name, docker_path)) def _load_docker_urls(self): """ Get all URLs to pre-build docker images in some repo. :return: """ - # also merge sap dicts, because internal saps also need a docker - # container - all_vnfs = self.vnfds.copy() - all_vnfs.update(self.saps) - - for k, v in all_vnfs.iteritems(): - for vu in v.get("virtual_deployment_units", {}): + for vnf_id, v in self.vnfds.iteritems(): + for vu in v.get("virtual_deployment_units", []): + vnf_container_name = get_container_name(vnf_id, vu.get("id")) if vu.get("vm_image_format") == "docker": url = vu.get("vm_image") if url is not None: url = url.replace("http://", "") - self.remote_docker_image_urls[k] = url + self.remote_docker_image_urls[vnf_container_name] = url LOG.debug("Found Docker image URL (%r): %r" % - (k, self.remote_docker_image_urls[k])) + (vnf_container_name, + self.remote_docker_image_urls[vnf_container_name])) + for cu in v.get("cloudnative_deployment_units", []): + vnf_container_name = get_container_name(vnf_id, cu.get("id")) + url = cu.get("image") + if url is not None: + url = url.replace("http://", "") + self.remote_docker_image_urls[vnf_container_name] = url + LOG.debug("Found Docker image URL (%r): %r" % + (vnf_container_name, + self.remote_docker_image_urls[vnf_container_name])) def _build_images_from_dockerfiles(self): """ @@ -964,59 +978,6 @@ class RoundRobinDcPlacement(object): c += 1 # inc. c to use next DC -class RoundRobinDcPlacementWithSAPs(object): - """ - Placement: Distribute VNFs across all available DCs in a round robin fashion, - every SAP is instantiated on the same DC as the connected VNF. - """ - - def place(self, nsd, vnfds, saps, dcs): - - # place vnfs - c = 0 - dcs_list = list(dcs.itervalues()) - for id, vnfd in vnfds.iteritems(): - vnfd["dc"] = dcs_list[c % len(dcs_list)] - c += 1 # inc. c to use next DC - - # place SAPs - vlinks = nsd.get("virtual_links", []) - eline_fwd_links = [l for l in vlinks if ( - l["connectivity_type"] == "E-Line")] - elan_fwd_links = [l for l in vlinks if ( - l["connectivity_type"] == "E-LAN")] - - # SAPs on E-Line links are placed on the same DC as the VNF on the - # E-Line - for link in eline_fwd_links: - src_id, src_if_name, src_sap_id = parse_interface( - link["connection_points_reference"][0]) - dst_id, dst_if_name, dst_sap_id = parse_interface( - link["connection_points_reference"][1]) - - # check if there is a SAP in the link - if src_sap_id in saps: - # get dc where connected vnf is mapped to - dc = vnfds[dst_id]['dc'] - saps[src_sap_id]['dc'] = dc - - if dst_sap_id in saps: - # get dc where connected vnf is mapped to - dc = vnfds[src_id]['dc'] - saps[dst_sap_id]['dc'] = dc - - # SAPs on E-LANs are placed on a random DC - dcs_list = list(dcs.itervalues()) - dc_len = len(dcs_list) - for link in elan_fwd_links: - for intf in link["connection_points_reference"]: - # find SAP interfaces - intf_id, intf_name, intf_sap_id = parse_interface(intf) - if intf_sap_id in saps: - dc = dcs_list[randint(0, dc_len - 1)] - saps[intf_sap_id]['dc'] = dc - - """ Resource definitions and API endpoints """ @@ -1049,7 +1010,7 @@ class Packages(fr.Resource): file_hash = hashlib.sha1(str(son_file)).hexdigest() # ensure that upload folder exists ensure_dir(UPLOAD_FOLDER) - upload_path = os.path.join(UPLOAD_FOLDER, "%s.son" % service_uuid) + upload_path = os.path.join(UPLOAD_FOLDER, "%s.tgo" % service_uuid) # store *.son file to disk if is_file_object: son_file.save(upload_path) @@ -1237,16 +1198,12 @@ def parse_interface(interface_name): :param interface_name: :return: """ - if ':' in interface_name: vnf_id, vnf_interface = interface_name.split(':') - vnf_sap_docker_name = interface_name.replace(':', '_') else: - vnf_id = interface_name + vnf_id = None vnf_interface = interface_name - vnf_sap_docker_name = interface_name - - return vnf_id, vnf_interface, vnf_sap_docker_name + return vnf_id, vnf_interface, None def reset_subnets(): @@ -1262,6 +1219,10 @@ def reset_subnets(): ELINE_SUBNETS = generate_subnets('10.30', 0, subnet_size=50, mask=30) +def get_container_name(vnf_id, vdu_id): + return "{}.{}".format(vnf_id, vdu_id) + + if __name__ == '__main__': """ Lets allow to run the API in standalone mode.