aboutsummaryrefslogtreecommitdiffstats
path: root/api/resources
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-07-14 01:38:47 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-07-14 04:38:42 +0000
commit2ae853c649f03b310527a4c291e839184a69f553 (patch)
treeb9b0853aa59ca01f71a76b50a7f1499e18f1887d /api/resources
parent0da3e8ad7c1374b3d0c25bd12b75b2e3b04688b0 (diff)
Add API(v2) to get openrc info
JIRA: YARDSTICK-721 API: /api/v2/yardstick/environments/openrcs/<openrc_id> METHOD: GET Change-Id: I57241381cf50fef0dc4eec3281c01ba106262a5a Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'api/resources')
-rw-r--r--api/resources/v2/openrcs.py33
1 files changed, 32 insertions, 1 deletions
diff --git a/api/resources/v2/openrcs.py b/api/resources/v2/openrcs.py
index cbe894629..afabcdec6 100644
--- a/api/resources/v2/openrcs.py
+++ b/api/resources/v2/openrcs.py
@@ -18,7 +18,7 @@ LOG = logging.getLogger(__name__)
LOG.setLevel(logging.DEBUG)
-class V2Openrc(ApiResource):
+class V2Openrcs(ApiResource):
def post(self):
return self._dispatch_post()
@@ -34,6 +34,11 @@ class V2Openrc(ApiResource):
except KeyError:
return result_handler(consts.API_ERROR, 'environment_id must be provided')
+ try:
+ uuid.UUID(environment_id)
+ except ValueError:
+ return result_handler(consts.API_ERROR, 'invalid environment id')
+
LOG.info('writing openrc: %s', consts.OPENRC)
makedirs(consts.CONF_DIR)
upload_file.save(consts.OPENRC)
@@ -70,6 +75,11 @@ class V2Openrc(ApiResource):
except KeyError:
return result_handler(consts.API_ERROR, 'environment_id must be provided')
+ try:
+ uuid.UUID(environment_id)
+ except ValueError:
+ return result_handler(consts.API_ERROR, 'invalid environment id')
+
LOG.info('writing openrc: %s', consts.OPENRC)
makedirs(consts.CONF_DIR)
@@ -157,3 +167,24 @@ class V2Openrc(ApiResource):
makedirs(consts.OPENSTACK_CONF_DIR)
with open(consts.CLOUDS_CONF, 'w') as f:
yaml.dump(ansible_conf, f, default_flow_style=False)
+
+
+class V2Openrc(ApiResource):
+
+ def get(self, openrc_id):
+ try:
+ uuid.UUID(openrc_id)
+ except ValueError:
+ return result_handler(consts.API_ERROR, 'invalid openrc id')
+
+ LOG.info('Geting openrc: %s', openrc_id)
+ openrc_handler = V2OpenrcHandler()
+ try:
+ openrc = openrc_handler.get_by_uuid(openrc_id)
+ except ValueError:
+ return result_handler(consts.API_ERROR, 'no such openrc id')
+
+ LOG.info('load openrc content')
+ content = jsonutils.loads(openrc.content)
+
+ return result_handler(consts.API_ERROR, {'openrc': content})