X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=58c91820ed3fcdd6cf1d3fb1d03bc802a79d8cc0;hb=82d406e3a7836e4b53997417044d273085e54019;hp=c69fd9a2333ebd204e05316e2f57153446a73cd9;hpb=b8d9ecb3e6fc0c477794259b96f76a2ed7049cd5;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py index c69fd9a..58c9182 100644 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -24,6 +24,9 @@ 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 @@ -70,6 +73,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 +87,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): @@ -125,7 +131,7 @@ 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") + docker_name = vnfd.get("name") target_dc = vnfd.get("dc") # 2. perform some checks to ensure we can start the container assert(docker_name is not None) @@ -142,9 +148,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 +172,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 +186,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): """ @@ -196,6 +204,17 @@ class Service(object): self.local_docker_files[k] = docker_path LOG.debug("Found Dockerfile: %r" % 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": + self.remote_docker_image_urls[k] = vu.get("vm_image") + LOG.debug("Found Docker image URL: %r" % self.remote_docker_image_urls[k]) + def _build_images_from_dockerfiles(self): """ Build Docker images for each local Dockerfile found in the package: self.local_docker_files @@ -209,11 +228,11 @@ 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 + # TODO implement this pass def _check_docker_image_exists(self, image_name): @@ -272,7 +291,13 @@ class Packages(fr.Resource): try: # get file contents print(request.files) - son_file = request.files['file'] + # lets search for the package in the request + if "package" in request.files: + son_file = request.files["package"] + # elif "file" in request.files: + # son_file = request.files["file"] + else: + return {"service_uuid": None, "size": 0, "sha1": None, "error": "upload failed. file not found."}, 500 # generate a uuid to reference this package service_uuid = str(uuid.uuid4()) file_hash = hashlib.sha1(str(son_file)).hexdigest() @@ -289,7 +314,7 @@ class Packages(fr.Resource): return {"service_uuid": service_uuid, "size": size, "sha1": file_hash, "error": None} except Exception as ex: LOG.exception("Service package upload failed:") - return {"service_uuid": None, "size": 0, "sha1": None, "error": "upload failed"} + return {"service_uuid": None, "size": 0, "sha1": None, "error": "upload failed"}, 500 def get(self): """ @@ -338,8 +363,8 @@ app = Flask(__name__) app.config['MAX_CONTENT_LENGTH'] = 512 * 1024 * 1024 # 512 MB max upload api = fr.Api(app) # define endpoints -api.add_resource(Packages, '/api/packages') -api.add_resource(Instantiations, '/api/instantiations') +api.add_resource(Packages, '/packages') +api.add_resource(Instantiations, '/instantiations') def start_rest_api(host, port, datacenters=dict()):