JIRA: YARDSTICK-364
Change-Id: I8c460064c058f77971140f69689ba638179f89d9
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
'resources/files/*',
'resources/scripts/install/*.bash',
'resources/scripts/remove/*.bash'
'resources/files/*',
'resources/scripts/install/*.bash',
'resources/scripts/remove/*.bash'
+ ],
+ 'etc': [
+ 'yardstick/nodes/*/*.yaml'
+ ],
+ 'tests': [
+ 'opnfv/*/*.yaml'
]
},
url="https://www.opnfv.org",
]
},
url="https://www.opnfv.org",
##############################################################################
import sys
##############################################################################
import sys
import yaml
import logging
from yardstick.benchmark.contexts.base import Context
import yaml
import logging
from yardstick.benchmark.contexts.base import Context
+from yardstick.definitions import YARDSTICK_ROOT_PATH
LOG = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
def init(self, attrs):
'''initializes itself from the supplied arguments'''
self.name = attrs["name"]
def init(self, attrs):
'''initializes itself from the supplied arguments'''
self.name = attrs["name"]
- self.file_path = attrs.get("file", "/etc/yardstick/nodes/pod.yaml")
+ self.file_path = attrs.get("file", "")
+ if not os.path.exists(self.file_path):
+ self.file_path = YARDSTICK_ROOT_PATH + self.file_path
LOG.info("Parsing pod file: %s", self.file_path)
LOG.info("Parsing pod file: %s", self.file_path)
##############################################################################
""" Handler for yardstick command 'testcase' """
##############################################################################
""" Handler for yardstick command 'testcase' """
-from yardstick.cmd import print_hbar
-from yardstick.common.task_template import TaskTemplate
-from yardstick.common.utils import cliargs
import os
import yaml
import sys
import os
import yaml
import sys
+from yardstick.cmd import print_hbar
+from yardstick.common.task_template import TaskTemplate
+from yardstick.common.utils import cliargs
+from yardstick.definitions import YARDSTICK_ROOT_PATH
+
class TestcaseCommands(object):
'''Testcase commands.
class TestcaseCommands(object):
'''Testcase commands.
Set of commands to discover and display test cases.
'''
def __init__(self):
Set of commands to discover and display test cases.
'''
def __init__(self):
- self.test_case_path = 'tests/opnfv/test_cases/'
+ self.test_case_path = YARDSTICK_ROOT_PATH + 'tests/opnfv/test_cases/'
self.testcase_list = []
def do_list(self, args):
self.testcase_list = []
def do_list(self, args):
--- /dev/null
+import os
+
+dirname = os.path.dirname
+YARDSTICK_ROOT_PATH = dirname(dirname(os.path.abspath(__file__)))
+YARDSTICK_ROOT_PATH += os.path.sep