X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=8423a31622f6f2e7173be243ecab9021fbd0901c;hb=3b21649946c32a3525175fa4949b0ac0f488ed31;hp=6475044db562023b939ff4d9bb77041c8cc41d7a;hpb=593ca58d734362b0ddc7ca6ac23631d11f94d57e;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 6475044..8423a31 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -24,9 +24,15 @@ GK_STORAGE = "/tmp/son-dummy-gk/" UPLOAD_FOLDER = os.path.join(GK_STORAGE, "uploads/") CATALOG_FOLDER = os.path.join(GK_STORAGE, "catalog/") +# Enable Dockerfile build functionality +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 = True + class Gatekeeper(object): @@ -70,6 +76,7 @@ class Service(object): self.nsd = None self.vnfds = dict() self.local_docker_files = dict() + self.remote_docker_image_urls = dict() self.instances = dict() def onboard(self): @@ -83,11 +90,13 @@ class Service(object): self._load_package_descriptor() self._load_nsd() self._load_vnfd() - self._load_docker_files() # 3. prepare container images (e.g. download or build Dockerfile) - self._build_images_from_dockerfiles() - self._download_predefined_dockerimages() - + if BUILD_DOCKERFILE: + self._load_docker_files() + self._build_images_from_dockerfiles() + else: + self._load_docker_urls() + self._pull_predefined_dockerimages() LOG.info("On-boarded service: %r" % self.manifest.get("package_name")) def start_service(self): @@ -99,11 +108,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) @@ -113,6 +124,20 @@ 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) + 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")] + + 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(":") + + if src_node in self.vnfds: + network = self.vnfds[src_node].get("dc").net # there should be a cleaner way to find the DCNetwork + network.setChain(src_node, dst_node, vnf_src_interface=src_port, vnf_dst_interface=dst_port) + LOG.info("Service started. Instance id: %r" % instance_uuid) return instance_uuid @@ -125,7 +150,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("vnf_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) @@ -134,7 +162,8 @@ 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") + vnfi = target_dc.startCompute(GK.get_next_vnf_name(), network=intfs, image=docker_name, flavor_name="small") # 6. store references to the compute objects in self.instances return vnfi @@ -142,9 +171,11 @@ class Service(object): """ unzip *.son file and store contents in CATALOG_FOLDER/services// """ + LOG.info("Unzipping: %r" % self.package_file_path) with zipfile.ZipFile(self.package_file_path, "r") as z: z.extractall(self.package_content_path) + def _load_package_descriptor(self): """ Load the main package descriptor YAML and keep it as dict. @@ -164,7 +195,7 @@ class Service(object): self.package_content_path, make_relative_path(self.manifest.get("entry_service_template"))) self.nsd = load_yaml(nsd_path) - LOG.debug("Loaded NSD: %r" % self.nsd.get("ns_name")) + LOG.debug("Loaded NSD: %r" % self.nsd.get("name")) def _load_vnfd(self): """ @@ -178,8 +209,8 @@ class Service(object): self.package_content_path, make_relative_path(pc.get("name"))) vnfd = load_yaml(vnfd_path) - self.vnfds[vnfd.get("vnf_name")] = vnfd - LOG.debug("Loaded VNFD: %r" % vnfd.get("vnf_name")) + self.vnfds[vnfd.get("name")] = vnfd + LOG.debug("Loaded VNFD: %r" % vnfd.get("name")) def _load_docker_files(self): """ @@ -194,7 +225,21 @@ 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): + """ + Get all URLs to pre-build docker images in some repo. + :return: + """ + for k, v in self.vnfds.iteritems(): + for vu in v.get("virtual_deployment_units"): + 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 + LOG.debug("Found Docker image URL (%r): %r" % (k, self.remote_docker_image_urls[k])) def _build_images_from_dockerfiles(self): """ @@ -209,12 +254,19 @@ class Service(object): LOG.debug("DOCKER BUILD: %s" % line) LOG.info("Docker image created: %s" % k) - def _download_predefined_dockerimages(self): + def _pull_predefined_dockerimages(self): """ If the package contains URLs to pre-build Docker images, we download them with this method. """ - # TODO implement this if we want to be able to download docker images instead of building them - 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): """