diff options
| author |   rexlee8776 <limingjiang@huawei.com> | 2018-05-09 09:52:27 +0000 |
|---|---|---|
| committer | rexlee8776 <limingjiang@huawei.com> | 2018-05-23 06:31:39 +0000 |
| commit | 4bc3b756f0eefad98aeacf32865eda85a61fb157 (patch) | |
| tree | 767554fd178df04a9408ff9c853312dd691f6143 /api/resources/v2 | |
| parent | 4c31d1fd8732e2944fb488e08fc36f331e7a8938 (diff) | |
Bugfix: openrc api dump should be safe_dump
1. fix safe_dump
2. fix pep8 problem, use flask_restapi custom error handling [1]
[1] https://flask-restful.readthedocs.io/en/latest/extending.html#custom-error-handlers
JIRA: YARDSTICK-1165
RestApi openrc dump clouds.yaml error
it now use yarml.dump, should be yaml.safe_dump.
dump would gererate !!python/unicode and cause error when upload openrc file in gui
Change-Id: Id3e85f7ba7d4967277ef79109b07d7552179e5db
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
(cherry picked from commit f1a71b2889da3b49358b10b9a12ea5a512dd2743)
Diffstat (limited to 'api/resources/v2')
| -rw-r--r-- | api/resources/v2/openrcs.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/api/resources/v2/openrcs.py b/api/resources/v2/openrcs.py index cb506d0e8..4706b856a 100644 --- a/api/resources/v2/openrcs.py +++ b/api/resources/v2/openrcs.py @@ -21,6 +21,7 @@ from yardstick.common import constants as consts from yardstick.common.utils import result_handler from yardstick.common.utils import makedirs from yardstick.common.utils import source_env +from yardstick.common import exceptions as y_exc LOG = logging.getLogger(__name__) LOG.setLevel(logging.DEBUG) @@ -57,7 +58,7 @@ class V2Openrcs(ApiResource): openrc_data = self._get_openrc_dict() except Exception: LOG.exception('parse openrc failed') - return result_handler(consts.API_ERROR, 'parse openrc failed') + raise y_exc.UploadOpenrcError() openrc_id = str(uuid.uuid4()) self._write_into_database(environment_id, openrc_id, openrc_data) @@ -67,7 +68,7 @@ class V2Openrcs(ApiResource): self._generate_ansible_conf_file(openrc_data) except Exception: LOG.exception('write cloud conf failed') - return result_handler(consts.API_ERROR, 'genarate ansible conf failed') + raise y_exc.UploadOpenrcError() LOG.info('finish writing ansible cloud conf') return result_handler(consts.API_SUCCESS, {'openrc': openrc_data, 'uuid': openrc_id}) @@ -102,7 +103,7 @@ class V2Openrcs(ApiResource): source_env(consts.OPENRC) except Exception: LOG.exception('source openrc failed') - return result_handler(consts.API_ERROR, 'source openrc failed') + raise y_exc.UpdateOpenrcError() LOG.info('source openrc: Done') openrc_id = str(uuid.uuid4()) @@ -113,7 +114,7 @@ class V2Openrcs(ApiResource): self._generate_ansible_conf_file(openrc_vars) except Exception: LOG.exception('write cloud conf failed') - return result_handler(consts.API_ERROR, 'genarate ansible conf failed') + raise y_exc.UpdateOpenrcError() LOG.info('finish writing ansible cloud conf') return result_handler(consts.API_SUCCESS, {'openrc': openrc_vars, 'uuid': openrc_id}) @@ -174,7 +175,7 @@ class V2Openrcs(ApiResource): makedirs(consts.OPENSTACK_CONF_DIR) with open(consts.CLOUDS_CONF, 'w') as f: - yaml.dump(ansible_conf, f, default_flow_style=False) + yaml.safe_dump(ansible_conf, f, default_flow_style=False) class V2Openrc(ApiResource): |