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=1b066f0503946441b8327bb5c21fa204fb101625;hp=d9ca0910f9c37d05d895a509c5f63696305c00fb;hb=1a8ce18a4b09ecacf30efe6d3d67a185183e5459;hpb=7b38ee1ed94ec3e9124e8e5b9c21cf224d39edc3 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 d9ca091..1b066f0 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,32 @@ +# Copyright (c) 2015 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 +38,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, @@ -35,21 +59,6 @@ class GlanceDummyApi(BaseOpenstackDummy): "/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() - class GlanceListApiVersions(Resource): def get(self): @@ -67,7 +76,8 @@ class GlanceListApiVersions(Resource): ] }] resp['versions'] = versions - return Response(json.dumps(resp), status=200, mimetype='application/json') + return Response(json.dumps(resp), status=200, + mimetype='application/json') class GlanceSchema(Resource): @@ -76,8 +86,10 @@ class GlanceSchema(Resource): resp = dict() resp['name'] = 'someImageName' resp['properties'] = dict() + resp['links'] = list() # just an ugly hack to allow the openstack client to work - return Response(json.dumps(resp), status=200, mimetype='application/json') + return Response(json.dumps(resp), status=200, + mimetype='application/json') class GlanceListImagesApi(Resource): @@ -86,15 +98,16 @@ class GlanceListImagesApi(Resource): def get(self): LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) - try: + try: + img_list = self.api.compute.images.values() + LOG.debug("Found {} Docker images: {}".format( + len(img_list), [i.name for i in img_list])) resp = dict() - resp['next'] = None + # resp['next'] = None resp['first'] = "/v2/images" resp['schema'] = "/v2/schemas/images" resp['images'] = list() - limit = 18 - c = 0 - for image in self.api.compute.images.values(): + for image in img_list: f = dict() f['id'] = image.id f['name'] = str(image.name).replace(":latest", "") @@ -116,15 +129,14 @@ class GlanceListImagesApi(Resource): f['virtual_size'] = 1 f['marker'] = None resp['images'].append(f) - 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 resp['images'] = None - return Response(json.dumps(resp), status=200, mimetype="application/json") + return Response(json.dumps(resp), status=200, + mimetype="application/json") except Exception as ex: - LOG.exception(u"%s: Could not retrieve the list of images." % __name__) + LOG.exception( + u"%s: Could not retrieve the list of images." % __name__) return ex.message, 500 def post(self): @@ -134,19 +146,24 @@ class GlanceListImagesApi(Resource): like the image was just created to make orchestrators, like OSM, happy. """ LOG.debug("API CALL: %s POST" % str(self.__class__.__name__)) - body_data = json.loads(request.data) + try: + body_data = json.loads(request.data) + except BaseException: + body_data = dict() # lets see what we should create img_name = request.headers.get("X-Image-Meta-Name") img_size = request.headers.get("X-Image-Meta-Size") img_disk_format = request.headers.get("X-Image-Meta-Disk-Format") img_is_public = request.headers.get("X-Image-Meta-Is-Public") - img_container_format = request.headers.get("X-Image-Meta-Container-Format") + img_container_format = request.headers.get( + "X-Image-Meta-Container-Format") # try to use body payload if header fields are empty if img_name is None: img_name = body_data.get("name") img_size = 1234 img_disk_format = body_data.get("disk_format") - img_is_public = True if "public" in body_data.get("visibility") else False + 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 @@ -179,7 +196,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 @@ -198,15 +215,19 @@ class GlanceImageByIdApi(Resource): resp['id'] = image.id resp['name'] = image.name - return Response(json.dumps(resp), status=200, mimetype="application/json") + 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 = 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') + 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__)) @@ -227,12 +248,16 @@ class GlanceImageByDockerNameApi(Resource): resp = dict() resp['id'] = image.id resp['name'] = image.name - return Response(json.dumps(resp), status=200, mimetype="application/json") + 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 = 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') + logging.exception( + u"%s: Could not retrieve image with id %s." % (__name__, id)) + return Response(ex.message, status=500, + mimetype='application/json')