Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve "get_server" function in Kubernetes context
[yardstick.git]
/
yardstick
/
benchmark
/
core
/
plugin.py
diff --git
a/yardstick/benchmark/core/plugin.py
b/yardstick/benchmark/core/plugin.py
index
c8d0865
..
56ecd29
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__)
@@
-38,19
+38,19
@@
class Plugin(object):
plugins, deployment = parser.parse_plugin()
plugin_name = plugins.get("name")
plugins, deployment = parser.parse_plugin()
plugin_name = plugins.get("name")
-
print("Installing plugin: %s" %
plugin_name)
+
LOG.info("Installing plugin: %s",
plugin_name)
- LOG.
info
("Executing _install_setup()")
+ LOG.
debug
("Executing _install_setup()")
self._install_setup(plugin_name, deployment)
self._install_setup(plugin_name, deployment)
- LOG.
info
("Executing _run()")
+ LOG.
debug
("Executing _run()")
self._run(plugin_name)
total_end_time = time.time()
self._run(plugin_name)
total_end_time = time.time()
- LOG.info("
t
otal finished in %d secs",
+ LOG.info("
T
otal finished in %d secs",
total_end_time - total_start_time)
total_end_time - total_start_time)
-
print("Done, exiting"
)
+
LOG.info("Plugin %s Done, exiting", plugin_name
)
def remove(self, args):
"""Remove a plugin."""
def remove(self, args):
"""Remove a plugin."""
@@
-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)