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=a61c710335571b545f86b256a6476738ef554a95;hp=e4b49b24991a2925350747f2ea52673b8f40259a;hb=8604c64592fb1775e45ad719a2530558e3877483;hpb=00199782de7042b51927bbbac5540d6f671597bb diff --git a/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py b/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py old mode 100644 new mode 100755 index e4b49b2..a61c710 --- a/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py +++ b/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py @@ -5,6 +5,9 @@ import logging import json +LOG = logging.getLogger("api.openstack.glance") + + class GlanceDummyApi(BaseOpenstackDummy): def __init__(self, in_ip, in_port, compute): super(GlanceDummyApi, self).__init__(in_ip, in_port) @@ -27,9 +30,13 @@ class GlanceDummyApi(BaseOpenstackDummy): "/v1/images/", "/v2/images/", resource_class_kwargs={'api': self}) + self.api.add_resource(GlanceImageByDockerNameApi, + "/v1/images//", + "/v2/images//", + resource_class_kwargs={'api': self}) def _start_flask(self): - logging.info("Starting %s endpoint @ http://%s:%d" % ("GlanceDummyApi", self.ip, self.port)) + 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) @@ -37,7 +44,7 @@ class GlanceDummyApi(BaseOpenstackDummy): class Shutdown(Resource): def get(self): - logging.debug(("%s is beeing shut down") % (__name__)) + 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') @@ -46,7 +53,7 @@ class Shutdown(Resource): class GlanceListApiVersions(Resource): def get(self): - logging.debug("API CALL: %s GET" % str(self.__class__.__name__)) + LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) resp = dict() resp['versions'] = dict() versions = [{ @@ -65,7 +72,7 @@ class GlanceListApiVersions(Resource): class GlanceSchema(Resource): def get(self): - logging.debug("API CALL: %s GET" % str(self.__class__.__name__)) + LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) resp = dict() resp['name'] = 'someImageName' resp['properties'] = dict() @@ -78,7 +85,7 @@ class GlanceListImagesApi(Resource): self.api = api def get(self): - logging.debug("API CALL: %s GET" % str(self.__class__.__name__)) + LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) try: resp = dict() resp['next'] = None @@ -109,7 +116,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 @@ -117,7 +124,7 @@ class GlanceListImagesApi(Resource): return Response(json.dumps(resp), status=200, mimetype="application/json") except Exception as ex: - logging.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): @@ -126,20 +133,31 @@ class GlanceListImagesApi(Resource): should already be registered with Docker. However, this function returns a reply that looks like the image was just created to make orchestrators, like OSM, happy. """ - logging.debug("API CALL: %s POST" % str(self.__class__.__name__)) + LOG.debug("API CALL: %s POST" % str(self.__class__.__name__)) + try: + body_data = json.loads(request.data) + except: + 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") + # 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_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 img_name in image.name: + if str(img_name) in image.name: img_id = image.id - logging.debug("Image name: %s" % img_name) - logging.debug("Image id: %s" % img_id) + LOG.debug("Image name: %s" % img_name) + LOG.debug("Image id: %s" % img_id) # build a response body that looks like a real one resp = dict() f = dict() @@ -175,14 +193,49 @@ class GlanceImageByIdApi(Resource): self.api = api def get(self, id): - logging.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) + LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) + 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): - logging.debug("API CALL: %s " % str(self.__class__.__name__)) - logging.warning("Endpoint not implemented") + LOG.debug("API CALL: %s " % str(self.__class__.__name__)) + LOG.warning("Endpoint not implemented") 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')