diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-08-16 16:19:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-08-16 16:19:56 +0000 |
commit | 95d9798e15d54270f73692b22b138b44f9defd7a (patch) | |
tree | 8c93ddf80dfb37dfd13253f8da4c69a023c4e95d /api/resources/v1 | |
parent | 4a5bc16d841221e8ac7853b3044e50af0c8143d2 (diff) | |
parent | c3d309865bb57e2aba2033d3bbe1c16adca4f0ba (diff) |
Merge "YAML fixes"
Diffstat (limited to 'api/resources/v1')
-rw-r--r-- | api/resources/v1/env.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/resources/v1/env.py b/api/resources/v1/env.py index 8367fa9eb..98b8ec7e4 100644 --- a/api/resources/v1/env.py +++ b/api/resources/v1/env.py @@ -31,7 +31,7 @@ from yardstick.common import utils from yardstick.common.utils import result_handler from yardstick.common import openstack_utils from yardstick.common.httpClient import HttpClient - +from yardstick.common.yaml_loader import yaml_load LOG = logging.getLogger(__name__) LOG.setLevel(logging.DEBUG) @@ -393,7 +393,7 @@ class V1Env(ApiResource): return result_handler(consts.API_ERROR, 'file must be provided') LOG.info('Checking file') - data = yaml.safe_load(pod_file.read()) + data = yaml_load(pod_file.read()) if not isinstance(data, collections.Mapping): return result_handler(consts.API_ERROR, 'invalid yaml file') |