From 221f4482bab3361cdb69161147e4d32d098d9a43 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Sat, 1 Apr 2017 01:19:16 +0000 Subject: 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 (cherry picked from commit b74d875134b988a26441d559a9e700aaa68d6a0c) --- api/resources/samples_action.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/resources/samples_action.py') diff --git a/api/resources/samples_action.py b/api/resources/samples_action.py index 490e48b25..3093864e0 100644 --- a/api/resources/samples_action.py +++ b/api/resources/samples_action.py @@ -11,8 +11,8 @@ import uuid import os import logging -from api import conf from api.utils import common as common_utils +from yardstick.common import constants as consts logger = logging.getLogger(__name__) @@ -24,7 +24,7 @@ def runTestCase(args): except KeyError: return common_utils.error_handler('Lack of testcase argument') - testcase = os.path.join(conf.SAMPLE_PATH, testcase_name + '.yaml') + testcase = os.path.join(consts.SAMPLE_CASE_DIR, testcase_name + '.yaml') task_id = str(uuid.uuid4()) -- cgit 1.2.3-korg