Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kubernetes context adoption when run in CI
[yardstick.git]
/
yardstick
/
benchmark
/
core
/
plugin.py
diff --git
a/yardstick/benchmark/core/plugin.py
b/yardstick/benchmark/core/plugin.py
index
c8d0865
..
24f1b6b
100644
(file)
--- a/
yardstick/benchmark/core/plugin.py
+++ b/
yardstick/benchmark/core/plugin.py
@@
-13,13
+13,13
@@
from __future__ import print_function
from __future__ import absolute_import
import os
import sys
from __future__ import absolute_import
import os
import sys
-import yaml
import time
import logging
import pkg_resources
import yardstick.ssh as ssh
from yardstick.common.task_template import TaskTemplate
import time
import logging
import pkg_resources
import yardstick.ssh as ssh
from yardstick.common.task_template import TaskTemplate
+from yardstick.common.yaml_loader import yaml_load
LOG = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
@@
-153,7
+153,7
@@
class PluginParser(object):
raise e
print("Input plugin is:\n%s\n" % rendered_plugin)
raise e
print("Input plugin is:\n%s\n" % rendered_plugin)
- cfg = yaml
.
load(rendered_plugin)
+ cfg = yaml
_
load(rendered_plugin)
except IOError as ioerror:
sys.exit(ioerror)
except IOError as ioerror:
sys.exit(ioerror)