projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
migration to python3 (#1)
[osm/vim-emu.git]
/
src
/
emuvim
/
api
/
openstack
/
openstack_dummies
/
glance_dummy_api.py
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
..
8d85974
100755
(executable)
--- 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:
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()
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", "")
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)
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,
if "marker" in request.args: # ugly hack to fix pageination of openstack client
resp['images'] = None
return Response(json.dumps(resp), status=200,
@@
-139,7
+137,7
@@
class GlanceListImagesApi(Resource):
except Exception as ex:
LOG.exception(
u"%s: Could not retrieve the list of images." % __name__)
except Exception as ex:
LOG.exception(
u"%s: Could not retrieve the list of images." % __name__)
- return
ex.message
, 500
+ return
str(ex)
, 500
def post(self):
"""
def post(self):
"""
@@
-228,7
+226,7
@@
class GlanceImageByIdApi(Resource):
except Exception as ex:
LOG.exception(
u"%s: Could not retrieve image with id %s." % (__name__, id))
except Exception as ex:
LOG.exception(
u"%s: Could not retrieve image with id %s." % (__name__, id))
- return Response(
ex.message
, status=500,
+ return Response(
str(ex)
, status=500,
mimetype='application/json')
def put(self, id):
mimetype='application/json')
def put(self, id):
@@
-261,5
+259,5
@@
class GlanceImageByDockerNameApi(Resource):
except Exception as ex:
logging.exception(
u"%s: Could not retrieve image with id %s." % (__name__, id))
except Exception as ex:
logging.exception(
u"%s: Could not retrieve image with id %s." % (__name__, id))
- return Response(
ex.message
, status=500,
+ return Response(
str(ex)
, status=500,
mimetype='application/json')
mimetype='application/json')