From cc3c7796ccb30b021c219cabdbe73bfc14fb38cc Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Thu, 13 Jul 2017 06:14:43 +0000 Subject: Add API to get environments JIRA: YARDSTICK-716 API: /api/v2/yardstick/environments METHOD: GET Change-Id: I46b7fb2b143fe76b6a0edbf1ecc8281187b85918 Signed-off-by: chenjiankun --- api/resources/v2/environments.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'api/resources') diff --git a/api/resources/v2/environments.py b/api/resources/v2/environments.py index dc6eac725..4b27c45b8 100644 --- a/api/resources/v2/environments.py +++ b/api/resources/v2/environments.py @@ -1,9 +1,12 @@ import uuid import logging +from oslo_serialization import jsonutils + from api import ApiResource from api.database.v2.handlers import V2EnvironmentHandler from yardstick.common.utils import result_handler +from yardstick.common.utils import change_obj_to_dict from yardstick.common import constants as consts LOG = logging.getLogger(__name__) @@ -12,6 +15,20 @@ LOG.setLevel(logging.DEBUG) class V2Environments(ApiResource): + def get(self): + environment_handler = V2EnvironmentHandler() + environments = [change_obj_to_dict(e) for e in environment_handler.list_all()] + + for e in environments: + container_info = e['container_id'] + e['container_id'] = jsonutils.loads(container_info) if container_info else {} + + data = { + 'environments': environments + } + + return result_handler(consts.API_SUCCESS, data) + def post(self): return self._dispatch_post() @@ -24,6 +41,7 @@ class V2Environments(ApiResource): env_id = str(uuid.uuid4()) environment_handler = V2EnvironmentHandler() + env_init_data = { 'name': name, 'uuid': env_id -- cgit 1.2.3-korg