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=16241e0823a60a9b886eb1c5a0101e31b3242c92;hb=1a8ce18a4b09ecacf30efe6d3d67a185183e5459;hpb=1662236de1bcda8b2eaf8194f00bbce19fb96be4 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 16241e0..1b066f0 100755 --- a/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py +++ b/src/emuvim/api/openstack/openstack_dummies/glance_dummy_api.py @@ -99,14 +99,15 @@ class GlanceListImagesApi(Resource): def get(self): LOG.debug("API CALL: %s GET" % str(self.__class__.__name__)) 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['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", "") @@ -128,9 +129,6 @@ 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,