diff options
| author |   chenjiankun <chenjiankun1@huawei.com> | 2017-04-01 01:19:16 +0000 |
|---|---|---|
| committer | chenjiankun <chenjiankun1@huawei.com> | 2017-04-01 06:24:12 +0000 |
| commit | b74d875134b988a26441d559a9e700aaa68d6a0c (patch) | |
| tree | 5e367401e8b5f16f2c2fe1d52d91203d2dd20424 /yardstick/benchmark/contexts/node.py | |
| parent | 66aa1cc17bcc3643c2852df7df4a355897ba0b57 (diff) | |
Yardstick virtualenv support
JIRA: YARDSTICK-620
Currently we recommend using docker to run yardstick.
And it is hard to use virtualenv to install yardstick.
So I modify install.sh in yardstick root path.
It will support using virtualenv to install yardstick(including API) in
linux.
In this patch, I make yardstick support read yardstick configuration
have priority over constants.
Change-Id: I9ea1241b228532a6497451e6c8f232173ddb783e
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'yardstick/benchmark/contexts/node.py')
| -rw-r--r-- | yardstick/benchmark/contexts/node.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/yardstick/benchmark/contexts/node.py b/yardstick/benchmark/contexts/node.py index 8bf915609..a4a2cfc57 100644 --- a/yardstick/benchmark/contexts/node.py +++ b/yardstick/benchmark/contexts/node.py @@ -19,7 +19,7 @@ import pkg_resources from yardstick import ssh from yardstick.benchmark.contexts.base import Context -from yardstick.common.constants import YARDSTICK_ROOT_PATH +from yardstick.common import constants as consts LOG = logging.getLogger(__name__) @@ -57,7 +57,7 @@ class NodeContext(Context): except IOError as ioerror: if ioerror.errno == errno.ENOENT: self.file_path = \ - os.path.join(YARDSTICK_ROOT_PATH, self.file_path) + os.path.join(consts.YARDSTICK_ROOT_PATH, self.file_path) cfg = self.read_config_file() else: raise @@ -108,8 +108,7 @@ class NodeContext(Context): def _do_ansible_job(self, path): cmd = 'ansible-playbook -i inventory.ini %s' % path - base = '/home/opnfv/repos/yardstick/ansible' - p = subprocess.Popen(cmd, shell=True, cwd=base) + p = subprocess.Popen(cmd, shell=True, cwd=consts.ANSIBLE_DIR) p.communicate() def _get_server(self, attr_name): @@ -164,7 +163,7 @@ class NodeContext(Context): def _execute_local_script(self, info): script, options = self._get_script(info) - script = os.path.join(YARDSTICK_ROOT_PATH, script) + script = os.path.join(consts.YARDSTICK_ROOT_PATH, script) cmd = ['bash', script, options] p = subprocess.Popen(cmd, stdout=subprocess.PIPE) |