X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fopenstack_dummies%2Fglance_dummy_api.py;h=4ce9e77ae95cdf29f9faa90d3f3d95cadeb38310;hp=f02ba12de7d8b9d305e0bd7dba98c065854b716d;hb=4e5c81ecd37e7383c52dad55079f91b90dec22fe;hpb=dfaca88c8fd1004a407ad645dc0b67df1a03a2a1 diff --git a/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py b/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py index f02ba12..4ce9e77 100755 --- a/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py +++ b/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py @@ -1,6 +1,34 @@ +""" +Copyright (c) 2017 SONATA-NFV and Paderborn University +ALL RIGHTS RESERVED. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Neither the name of the SONATA-NFV, Paderborn University +nor the names of its contributors may be used to endorse or promote +products derived from this software without specific prior written +permission. + +This work has been performed in the framework of the SONATA project, +funded by the European Commission under Grant number 671517 through +the Horizon 2020 and 5G-PPP programmes. The authors would like to +acknowledge the contributions of their colleagues of the SONATA +partner consortium (www.sonata-nfv.eu). +""" from flask_restful import Resource from flask import Response, request from emuvim.api.openstack.openstack_dummies.base_openstack_dummy import BaseOpenstackDummy +from emuvim.api.openstack.helper import get_host import logging import json @@ -12,8 +40,6 @@ class GlanceDummyApi(BaseOpenstackDummy): def __init__(self, in_ip, in_port, compute): super(GlanceDummyApi, self).__init__(in_ip, in_port) self.compute = compute - self.api.add_resource(Shutdown, - "/shutdown") self.api.add_resource(GlanceListApiVersions, "/versions") self.api.add_resource(GlanceSchema, @@ -30,21 +56,10 @@ class GlanceDummyApi(BaseOpenstackDummy): "/v1/images/", "/v2/images/", resource_class_kwargs={'api': self}) - - def _start_flask(self): - LOG.info("Starting %s endpoint @ http://%s:%d" % ("GlanceDummyApi", self.ip, self.port)) - if self.app is not None: - self.app.before_request(self.dump_playbook) - self.app.run(self.ip, self.port, debug=True, use_reloader=False) - - -class Shutdown(Resource): - def get(self): - LOG.debug(("%s is beeing shut down") % (__name__)) - func = request.environ.get('werkzeug.server.shutdown') - if func is None: - raise RuntimeError('Not running with the Werkzeug Server') - func() + self.api.add_resource(GlanceImageByDockerNameApi, + "/v1/images//", + "/v2/images//", + resource_class_kwargs={'api': self}) class GlanceListApiVersions(Resource): @@ -112,7 +127,7 @@ class GlanceListImagesApi(Resource): f['virtual_size'] = 1 f['marker'] = None resp['images'].append(f) - c+=1 + c += 1 if c > limit: # ugly hack to stop buggy glance client to do infinite requests break if "marker" in request.args: # ugly hack to fix pageination of openstack client @@ -148,7 +163,7 @@ class GlanceListImagesApi(Resource): img_is_public = True if "public" in body_data.get("visibility") else False img_container_format = body_data.get("container_format") # try to find ID of already existing image (matched by name) - img_id=None + img_id = None for image in self.api.compute.images.values(): if str(img_name) in image.name: img_id = image.id @@ -178,7 +193,7 @@ class GlanceListImagesApi(Resource): resp['image'] = f # build actual response with headers and everything r = Response(json.dumps(resp), status=201, mimetype="application/json") - r.headers.add("Location", "http://%s:%d/v1/images/%s" % (self.api.ip, + r.headers.add("Location", "http://%s:%d/v1/images/%s" % (get_host(request), self.api.port, img_id)) return r @@ -190,9 +205,22 @@ class GlanceImageByIdApi(Resource): def get(self, id): LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) - from emuvim.api.heat.openstack_dummies.nova_dummy_api import NovaListImages - nova = NovaListImages(self.api) - return nova.get(id) + try: + resp = dict() + for image in self.api.compute.images.values(): + if image.id == id or image.name == id: + resp['id'] = image.id + resp['name'] = image.name + + return Response(json.dumps(resp), status=200, mimetype="application/json") + + response = Response("Image with id or name %s does not exists." % id, status=404) + response.headers['Access-Control-Allow-Origin'] = '*' + return response + + except Exception as ex: + LOG.exception(u"%s: Could not retrieve image with id %s." % (__name__, id)) + return Response(ex.message, status=500, mimetype='application/json') def put(self, id): LOG.debug("API CALL: %s " % str(self.__class__.__name__)) @@ -200,3 +228,25 @@ class GlanceImageByIdApi(Resource): return None +class GlanceImageByDockerNameApi(Resource): + def __init__(self, api): + self.api = api + + def get(self, owner, container): + logging.debug("API CALL: %s GET" % str(self.__class__.__name__)) + try: + name = "%s/%s" % (owner, container) + if name in self.api.compute.images: + image = self.api.compute.images[name] + resp = dict() + resp['id'] = image.id + resp['name'] = image.name + return Response(json.dumps(resp), status=200, mimetype="application/json") + + response = Response("Image with id or name %s does not exists." % id, status=404) + response.headers['Access-Control-Allow-Origin'] = '*' + return response + + except Exception as ex: + logging.exception(u"%s: Could not retrieve image with id %s." % (__name__, id)) + return Response(ex.message, status=500, mimetype='application/json')