Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add function to upload image from local/url in GUI
[yardstick.git]
/
api
/
resources
/
v2
/
environments.py
diff --git
a/api/resources/v2/environments.py
b/api/resources/v2/environments.py
index
f021a3c
..
158e98b
100644
(file)
--- a/
api/resources/v2/environments.py
+++ b/
api/resources/v2/environments.py
@@
-35,6
+35,9
@@
class V2Environments(ApiResource):
container_info = e['container_id']
e['container_id'] = jsonutils.loads(container_info) if container_info else {}
container_info = e['container_id']
e['container_id'] = jsonutils.loads(container_info) if container_info else {}
+ image_id = e['image_id']
+ e['image_id'] = image_id.split(',') if image_id else []
+
data = {
'environments': environments
}
data = {
'environments': environments
}
@@
-78,8
+81,13
@@
class V2Environment(ApiResource):
return result_handler(consts.API_ERROR, 'no such environment id')
environment = change_obj_to_dict(environment)
return result_handler(consts.API_ERROR, 'no such environment id')
environment = change_obj_to_dict(environment)
+
container_id = environment['container_id']
environment['container_id'] = jsonutils.loads(container_id) if container_id else {}
container_id = environment['container_id']
environment['container_id'] = jsonutils.loads(container_id) if container_id else {}
+
+ image_id = environment['image_id']
+ environment['image_id'] = image_id.split(',') if image_id else []
+
return result_handler(consts.API_SUCCESS, {'environment': environment})
def delete(self, environment_id):
return result_handler(consts.API_SUCCESS, {'environment': environment})
def delete(self, environment_id):