X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=136ccc83aaf9e3109b3399afa5c23bfadf1a9a4d;hb=29afff5798b26242e1bfe1d92ef0ef0d9ddc4a97;hp=d6aef6c4229f94696eb0f8969457e0b6edb20e2e;hpb=b101872396a91b6cda600a4c8567c6a943209943;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py index d6aef6c..136ccc8 100755 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -47,6 +47,7 @@ import pkg_resources from subprocess import Popen from random import randint import ipaddress +import copy logging.basicConfig() LOG = logging.getLogger("sonata-dummy-gatekeeper") @@ -74,7 +75,13 @@ DEPLOY_SAP = False BIDIRECTIONAL_CHAIN = False # override the management interfaces in the descriptors with default docker0 interfaces in the containers -USE_DOCKER_MGMT = True +USE_DOCKER_MGMT = False + +# automatically deploy uploaded packages (no need to execute son-access deploy --latest separately) +AUTO_DEPLOY = False + +# and also automatically terminate any other running services +AUTO_DELETE = False def generate_subnets(prefix, base, subnet_size=50, mask=24): # Generate a list of ipaddress in subnets @@ -85,12 +92,14 @@ def generate_subnets(prefix, base, subnet_size=50, mask=24): return r # private subnet definitions for the generated interfaces # 10.10.xxx.0/24 -SAP_SUBNETS = generate_subnets('10.10', 0, subnet_size=50, mask=24) -# 10.20.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) +# path to the VNFD for the SAP VNF that is deployed as internal SAP point +SAP_VNFD=None class Gatekeeper(object): @@ -140,7 +149,8 @@ class Service(object): self.local_docker_files = dict() self.remote_docker_image_urls = dict() self.instances = dict() - self.vnf_name2docker_name = dict() + #self.vnf_name2docker_name = dict() + # dict to find the vnf_name for any vnf id self.vnf_id2vnf_name = dict() def onboard(self): @@ -156,11 +166,6 @@ class Service(object): self._load_vnfd() if DEPLOY_SAP: self._load_saps() - # create dict to translate vnf names - self.vnf_id2vnf_name = defaultdict(lambda: "NotExistingNode", - reduce(lambda x, y: dict(x, **y), - map(lambda d: {d["vnf_id"]: d["vnf_name"]}, - self.nsd["network_functions"]))) # 3. prepare container images (e.g. download or build Dockerfile) if BUILD_DOCKERFILE: self._load_docker_files() @@ -190,12 +195,13 @@ class Service(object): 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) - for vnfd in self.vnfds.itervalues(): + for vnf_id in self.vnf_id2vnf_name: + vnf_name = self.vnf_id2vnf_name[vnf_id] + vnfd = self.vnfds[vnf_name] vnfi = None if not GK_STANDALONE_MODE: - vnfi = self._start_vnfd(vnfd) + vnfi = self._start_vnfd(vnfd, vnf_id) self.instances[instance_uuid]["vnf_instances"].append(vnfi) # 4. start all SAPs in the service @@ -241,6 +247,12 @@ class Service(object): for v in vnf_instances: self._stop_vnfi(v) + for sap_name in self.saps_ext: + ext_sap = self.saps[sap_name] + target_dc = ext_sap.get("dc") + target_dc.removeExternalSAP(sap_name, ext_sap['net']) + 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) @@ -249,16 +261,20 @@ class Service(object): # last step: remove the instance from the list of all instances del self.instances[instance_uuid] - def _start_vnfd(self, vnfd): + def _start_vnfd(self, vnfd, vnf_id): """ Start a single VNFD of this service :param vnfd: vnfd descriptor dict + :param vnf-id: vnfd descriptor dict :return: """ + # the vnf_name refers to the container to be deployed + vnf_name = vnfd.get("name") + + # 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 - vnf_name = vnfd.get("name") if vnf_name not in self.remote_docker_image_urls: raise Exception("No image name for %r found. Abort." % vnf_name) docker_name = self.remote_docker_image_urls.get(vnf_name) @@ -293,15 +309,22 @@ class Service(object): mem_lim = int(mem_limit) cpu_period, cpu_quota = self._calculate_cpu_cfs_values(float(cpu_bw)) - vnf_name2id = defaultdict(lambda: "NotExistingNode", - reduce(lambda x, y: dict(x, **y), - map(lambda d: {d["vnf_name"]: d["vnf_id"]}, - self.nsd["network_functions"]))) + + # vnf_name2id = defaultdict(lambda: "NotExistingNode", + # reduce(lambda x, y: dict(x, **y), + # map(lambda d: {d["vnf_name"]: d["vnf_id"]}, + # self.nsd["network_functions"]))) + + # vnf_id2name = defaultdict(lambda: "NotExistingNode", + # reduce(lambda x, y: dict(x, **y), + # map(lambda d: {d["vnf_id"]: d["vnf_name"]}, + # self.nsd["network_functions"]))) # 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: - vnf_id = vnf_name2id[vnf_name] + #vnf_id = vnf_name2id[vnf_name] 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: @@ -312,23 +335,46 @@ class Service(object): 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 + volumes=list() + # a volume to extract log files + docker_log_path = "/tmp/results/%s/%s"%(self.uuid,vnf_name) + LOG.debug("LOG path for vnf %s is %s."%(vnf_name,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/") - # 4. do the dc.startCompute(name="foobar") call to run the container + + # 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 - self.vnf_name2docker_name[vnf_name] = vnf_name2id[vnf_name] - - LOG.info("Starting %r as %r in DC %r" % (vnf_name, self.vnf_name2docker_name[vnf_name], vnfd.get("dc"))) - LOG.debug("Interfaces for %r: %r" % (vnf_name, intfs)) - vnfi = target_dc.startCompute(self.vnf_name2docker_name[vnf_name], network=intfs, image=docker_name, flavor_name="small", - cpu_quota=cpu_quota, cpu_period=cpu_period, cpuset=cpu_list, mem_limit=mem_lim) - - # rename the docker0 interfaces (eth0) to 'docker_mgmt' in the VNFs + #self.vnf_name2docker_name[vnf_name] = vnf_id + + #LOG.info("Starting %r as %r in DC %r" % (vnf_name, self.vnf_name2docker_name[vnf_name], vnfd.get("dc"))) + LOG.info("Starting %r as %r in DC %r" % (vnf_name, vnf_id, vnfd.get("dc"))) + LOG.debug("Interfaces for %r: %r" % (vnf_id, intfs)) + vnfi = target_dc.startCompute( + vnf_id, + network=intfs, + image=docker_name, + flavor_name="small", + cpu_quota=cpu_quota, + cpu_period=cpu_period, + cpuset=cpu_list, + mem_limit=mem_lim, + volumes=volumes) + + # rename the docker0 interfaces (eth0) to the management port name defined in the VNFD if USE_DOCKER_MGMT: - self._vnf_reconfigure_network(vnfi, 'eth0', new_name='docker_mgmt') + for intf_name in mgmt_intf_names: + self._vnf_reconfigure_network(vnfi, 'eth0', new_name=intf_name) return vnfi @@ -341,20 +387,21 @@ class Service(object): # Find the correct datacenter status = vnfi.getStatus() dc = vnfi.datacenter + # stop the vnfi LOG.info("Stopping the vnf instance contained in %r in DC %r" % (status["name"], dc)) dc.stopCompute(status["name"]) - def _get_vnf_instance(self, instance_uuid, name): + def _get_vnf_instance(self, instance_uuid, vnf_id): """ - Returns the Docker object for the given VNF name (or Docker name). + 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: """ - dn = name - if name in self.vnf_name2docker_name: - dn = self.vnf_name2docker_name[name] + dn = vnf_id + #if vnf_id in self.vnf_name2docker_name: + # dn = self.vnf_name2docker_name[name] for vnfi in self.instances[instance_uuid]["vnf_instances"]: if vnfi.name == dn: return vnfi @@ -432,6 +479,11 @@ class Service(object): make_relative_path(self.manifest.get("entry_service_template"))) self.nsd = load_yaml(nsd_path) GK.net.deployed_nsds.append(self.nsd) + # create dict to find the vnf_name for any vnf id + self.vnf_id2vnf_name = defaultdict(lambda: "NotExistingNode", + reduce(lambda x, y: dict(x, **y), + map(lambda d: {d["vnf_id"]: d["vnf_name"]}, + self.nsd["network_functions"]))) LOG.debug("Loaded NSD: %r" % self.nsd.get("name")) @@ -448,7 +500,7 @@ class Service(object): make_relative_path(pc.get("name"))) vnfd = load_yaml(vnfd_path) self.vnfds[vnfd.get("name")] = vnfd - LOG.debug("Loaded VNFD: %r" % vnfd.get("name")) + LOG.debug("Loaded VNFD: %r" % vnfd.get("id")) def _load_saps(self): # create list of all SAPs @@ -477,7 +529,10 @@ class Service(object): # Each Service Access Point (connection_point) in the nsd is getting its own container (default) elif sap["type"] == "internal" or sap["type"] == "management": # add SAP to self.vnfds - sapfile = pkg_resources.resource_filename(__name__, "sap_vnfd.yml") + if SAP_VNFD is None: + sapfile = pkg_resources.resource_filename(__name__, "sap_vnfd.yml") + else: + sapfile = SAP_VNFD sap_vnfd = load_yaml(sapfile) sap_vnfd["connection_points"][0]["id"] = sap_interface sap_vnfd["name"] = sap_docker_name @@ -509,7 +564,7 @@ class Service(object): elif sap["type"] == "external": target_dc = sap.get("dc") # add interface to dc switch - target_dc.attachExternalSAP(sap['name'], str(sap['net'])) + target_dc.attachExternalSAP(sap['name'], sap['net']) def _connect_elines(self, eline_fwd_links, instance_uuid): """ @@ -538,26 +593,28 @@ class Service(object): elif src_sap_id in self.saps_ext: src_id = src_sap_id - src_if_name = src_sap_id - src_name = self.vnf_id2vnf_name[src_id] - dst_name = self.vnf_id2vnf_name[dst_id] - dst_vnfi = self._get_vnf_instance(instance_uuid, dst_name) + # set intf name to None so the chaining function will choose the first one + src_if_name = None + #src_name = self.vnf_id2vnf_name[src_id] + #dst_name = self.vnf_id2vnf_name[dst_id] + dst_vnfi = self._get_vnf_instance(instance_uuid, dst_id) if dst_vnfi is not None: # choose first ip address in sap subnet sap_net = self.saps[src_sap_id]['net'] - sap_ip = "{0}/{1}".format(str(sap_net[1]), sap_net.prefixlen) + sap_ip = "{0}/{1}".format(str(sap_net[2]), sap_net.prefixlen) self._vnf_reconfigure_network(dst_vnfi, dst_if_name, sap_ip) setChaining = True elif dst_sap_id in self.saps_ext: dst_id = dst_sap_id - dst_if_name = dst_sap_id - src_name = self.vnf_id2vnf_name[src_id] - dst_name = self.vnf_id2vnf_name[dst_id] - src_vnfi = self._get_vnf_instance(instance_uuid, src_name) + # set intf name to None so the chaining function will choose the first one + dst_if_name = None + #src_name = self.vnf_id2vnf_name[src_id] + #dst_name = self.vnf_id2vnf_name[dst_id] + src_vnfi = self._get_vnf_instance(instance_uuid, src_id) if src_vnfi is not None: sap_net = self.saps[dst_sap_id]['net'] - sap_ip = "{0}/{1}".format(str(sap_net[1]), sap_net.prefixlen) + sap_ip = "{0}/{1}".format(str(sap_net[2]), sap_net.prefixlen) self._vnf_reconfigure_network(src_vnfi, src_if_name, sap_ip) setChaining = True @@ -568,11 +625,11 @@ class Service(object): src_id = src_sap_id if dst_sap_id in self.saps_int: dst_id = dst_sap_id - src_name = self.vnf_id2vnf_name[src_id] - dst_name = self.vnf_id2vnf_name[dst_id] + #src_name = self.vnf_id2vnf_name[src_id] + #dst_name = self.vnf_id2vnf_name[dst_id] # re-configure the VNFs IP assignment and ensure that a new subnet is used for each E-Link - src_vnfi = self._get_vnf_instance(instance_uuid, src_name) - dst_vnfi = self._get_vnf_instance(instance_uuid, dst_name) + 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: eline_net = ELINE_SUBNETS.pop(0) ip1 = "{0}/{1}".format(str(eline_net[1]), eline_net.prefixlen) @@ -588,8 +645,8 @@ class Service(object): 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(%s:%s)" % ( - src_name, src_id, src_if_name, dst_name, dst_id, dst_if_name)) + "Setting up E-Line link. (%s:%s) -> (%s:%s)" % ( + src_id, src_if_name, dst_id, dst_if_name)) def _connect_elans(self, elan_fwd_links, instance_uuid): @@ -635,16 +692,16 @@ class Service(object): src_docker_name = vnf_sap_id vnf_id = vnf_sap_id - vnf_name = self.vnf_id2vnf_name[vnf_id] + #vnf_name = self.vnf_id2vnf_name[vnf_id] LOG.debug( "Setting up E-LAN interface. %s(%s:%s) -> %s" % ( - vnf_name, vnf_id, intf_name, ip_address)) + vnf_id, intf_name, ip_address)) - if vnf_name in self.vnfds: + if vnf_id in self.vnfds: # 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_name) + 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 @@ -833,10 +890,10 @@ class RoundRobinDcPlacementWithSAPs(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")] - vnf_id2vnf_name = defaultdict(lambda: "NotExistingNode", - reduce(lambda x, y: dict(x, **y), - map(lambda d: {d["vnf_id"]: d["vnf_name"]}, - nsd["network_functions"]))) + # vnf_id2vnf_name = defaultdict(lambda: "NotExistingNode", + # reduce(lambda x, y: dict(x, **y), + # map(lambda d: {d["vnf_id"]: d["vnf_name"]}, + # nsd["network_functions"]))) # SAPs on E-Line links are placed on the same DC as the VNF on the E-Line for link in eline_fwd_links: @@ -845,15 +902,15 @@ class RoundRobinDcPlacementWithSAPs(object): # check if there is a SAP in the link if src_sap_id in saps: - dst_vnf_name = vnf_id2vnf_name[dst_id] + #dst_vnf_name = vnf_id2vnf_name[dst_id] # get dc where connected vnf is mapped to - dc = vnfds[dst_vnf_name]['dc'] + dc = vnfds[dst_id]['dc'] saps[src_sap_id]['dc'] = dc if dst_sap_id in saps: - src_vnf_name = vnf_id2vnf_name[src_id] + #src_vnf_name = vnf_id2vnf_name[src_id] # get dc where connected vnf is mapped to - dc = vnfds[src_vnf_name]['dc'] + dc = vnfds[src_id]['dc'] saps[dst_sap_id]['dc'] = dc # SAPs on E-LANs are placed on a random DC @@ -908,9 +965,27 @@ class Packages(fr.Resource): with open(upload_path, 'wb') as f: f.write(son_file) size = os.path.getsize(upload_path) + + # first stop and delete any other running services + if AUTO_DELETE: + service_list = copy.copy(GK.services) + for service_uuid in service_list: + instances_list = copy.copy(GK.services[service_uuid].instances) + for instance_uuid in instances_list: + # valid service and instance UUID, stop service + GK.services.get(service_uuid).stop_service(instance_uuid) + LOG.info("service instance with uuid %r stopped." % instance_uuid) + # create a service object and register it s = Service(service_uuid, file_hash, upload_path) GK.register_service_package(service_uuid, s) + + # automatically deploy the service + if AUTO_DEPLOY: + # ok, we have a service uuid, lets start the service + reset_subnets() + service_instance_uuid = GK.services.get(service_uuid).start_service() + # generate the JSON result return {"service_uuid": service_uuid, "size": size, "sha1": file_hash, "error": None}, 201 except Exception as ex: @@ -934,7 +1009,7 @@ class Instantiations(fr.Resource): Will return a new UUID to identify the running service instance. :return: UUID """ - LOG.info("POST /instantiations (or /reqeusts) called") + LOG.info("POST /instantiations (or /requests) called") # try to extract the service uuid from the request json_data = request.get_json(force=True) service_uuid = json_data.get("service_uuid") @@ -1008,10 +1083,6 @@ api.add_resource(Instantiations, '/instantiations', '/api/v2/instantiations', '/ api.add_resource(Exit, '/emulator/exit') -#def initialize_GK(): -# global GK -# GK = Gatekeeper() - def start_rest_api(host, port, datacenters=dict()): GK.dcs = datacenters @@ -1074,6 +1145,18 @@ def parse_interface(interface_name): return vnf_id, vnf_interface, vnf_sap_docker_name +def reset_subnets(): + # private subnet definitions for the generated interfaces + # 10.10.xxx.0/24 + global SAP_SUBNETS + SAP_SUBNETS = generate_subnets('10.10', 0, subnet_size=50, mask=30) + # 10.20.xxx.0/30 + global ELAN_SUBNETS + ELAN_SUBNETS = generate_subnets('10.20', 0, subnet_size=50, mask=24) + # 10.30.xxx.0/30 + global ELINE_SUBNETS + ELINE_SUBNETS = generate_subnets('10.30', 0, subnet_size=50, mask=30) + if __name__ == '__main__': """ Lets allow to run the API in standalone mode.