X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=c5de3cc7b42f83ae3427af2c7e9d6219f939a2da;hb=eb3ebd72baa2365ad1a9c098c5cba8a6dba897aa;hp=58c91820ed3fcdd6cf1d3fb1d03bc802a79d8cc0;hpb=82d406e3a7836e4b53997417044d273085e54019;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py old mode 100644 new mode 100755 index 58c9182..c5de3cc --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -14,6 +14,7 @@ import yaml from docker import Client as DockerClient from flask import Flask, request import flask_restful as fr +from collections import defaultdict logging.basicConfig() LOG = logging.getLogger("sonata-dummy-gatekeeper") @@ -30,6 +31,8 @@ BUILD_DOCKERFILE = False # flag to indicate that we run without the emulator (only the bare API for integration testing) GK_STANDALONE_MODE = False +# should a new version of an image be pulled even if its available +FORCE_PULL = False class Gatekeeper(object): @@ -75,6 +78,7 @@ class Service(object): self.local_docker_files = dict() self.remote_docker_image_urls = dict() self.instances = dict() + self.vnfname2num = dict() def onboard(self): """ @@ -105,11 +109,13 @@ class Service(object): :return: """ LOG.info("Starting service %r" % self.uuid) + # 1. each service instance gets a new uuid to identify it instance_uuid = str(uuid.uuid4()) # build a instances dict (a bit like a NSR :)) self.instances[instance_uuid] = dict() self.instances[instance_uuid]["vnf_instances"] = list() + # 2. compute placement of this service instance (adds DC names to VNFDs) if not GK_STANDALONE_MODE: self._calculate_placement(FirstDcPlacement) @@ -119,6 +125,33 @@ class Service(object): if not GK_STANDALONE_MODE: vnfi = self._start_vnfd(vnfd) self.instances[instance_uuid]["vnf_instances"].append(vnfi) + + # 3. Configure the chaining of the network functions (currently only E-Line links supported) + nfid2name = defaultdict(lambda :"NotExistingNode", + reduce(lambda x,y: dict(x, **y), + map(lambda d:{d["vnf_id"]:d["vnf_name"]}, + self.nsd["network_functions"]))) + + vlinks = self.nsd["virtual_links"] + fwd_links = self.nsd["forwarding_graphs"][0]["constituent_virtual_links"] + eline_fwd_links = [l for l in vlinks if (l["id"] in fwd_links) and (l["connectivity_type"] == "E-Line")] + + cookie = 1 # not clear why this is needed - to check with Steven + for link in eline_fwd_links: + src_node, src_port = link["connection_points_reference"][0].split(":") + dst_node, dst_port = link["connection_points_reference"][1].split(":") + + srcname = nfid2name[src_node] + dstname = nfid2name[dst_node] + LOG.debug("src name: "+srcname+" dst name: "+dstname) + + if (srcname in self.vnfds) and (dstname in self.vnfds) : + network = self.vnfds[srcname].get("dc").net # there should be a cleaner way to find the DCNetwork + src_vnf = self.vnfname2num[srcname] + dst_vnf = self.vnfname2num[dstname] + ret = network.setChain(src_vnf, dst_vnf, vnf_src_interface=src_port, vnf_dst_interface=dst_port, bidirectional = True, cmd="add-flow", cookie = cookie) + cookie += 1 + LOG.info("Service started. Instance id: %r" % instance_uuid) return instance_uuid @@ -131,7 +164,10 @@ class Service(object): # 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 - docker_name = vnfd.get("name") + 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) target_dc = vnfd.get("dc") # 2. perform some checks to ensure we can start the container assert(docker_name is not None) @@ -140,7 +176,10 @@ class Service(object): raise Exception("Docker image %r not found. Abort." % docker_name) # 3. do the dc.startCompute(name="foobar") call to run the container # TODO consider flavors, and other annotations - vnfi = target_dc.startCompute(GK.get_next_vnf_name(), image=docker_name, flavor_name="small") + intfs = vnfd.get("connection_points") + self.vnfname2num[vnf_name] = GK.get_next_vnf_name() + LOG.info("VNF "+vnf_name+" mapped to "+self.vnfname2num[vnf_name]+" on dc "+str(vnfd.get("dc"))) + vnfi = target_dc.startCompute(self.vnfname2num[vnf_name], network=intfs, image=docker_name, flavor_name="small") # 6. store references to the compute objects in self.instances return vnfi @@ -202,7 +241,7 @@ class Service(object): self.package_content_path, make_relative_path(vm_image)) self.local_docker_files[k] = docker_path - LOG.debug("Found Dockerfile: %r" % docker_path) + LOG.debug("Found Dockerfile (%r): %r" % (k, docker_path)) def _load_docker_urls(self): """ @@ -212,8 +251,11 @@ class Service(object): for k, v in self.vnfds.iteritems(): for vu in v.get("virtual_deployment_units"): if vu.get("vm_image_format") == "docker": - self.remote_docker_image_urls[k] = vu.get("vm_image") - LOG.debug("Found Docker image URL: %r" % self.remote_docker_image_urls[k]) + url = vu.get("vm_image") + if url is not None: + url = url.replace("http://", "") + self.remote_docker_image_urls[k] = url + LOG.debug("Found Docker image URL (%r): %r" % (k, self.remote_docker_image_urls[k])) def _build_images_from_dockerfiles(self): """ @@ -232,8 +274,15 @@ class Service(object): """ If the package contains URLs to pre-build Docker images, we download them with this method. """ - # TODO implement this - pass + dc = DockerClient() + for url in self.remote_docker_image_urls.itervalues(): + if not FORCE_PULL: # only pull if not present (speedup for development) + if len(dc.images(name=url)) > 0: + LOG.debug("Image %r present. Skipping pull." % url) + continue + LOG.info("Pulling image: %r" % url) + dc.pull(url, + insecure_registry=True) def _check_docker_image_exists(self, image_name): """