diff options
| -rw-r--r-- | etc/__init__.py | 0 | ||||
| -rwxr-xr-x | setup.py | 6 | ||||
| -rw-r--r-- | tests/unit/dispatcher/test_influxdb_line_protocol.py | 2 | ||||
| -rw-r--r-- | third_party/__init__.py | 0 | ||||
| -rw-r--r-- | third_party/influxdb/__init__.py | 0 | ||||
| -rw-r--r-- | third_party/influxdb/influxdb_line_protocol.py (renamed from yardstick/dispatcher/influxdb_line_protocol.py) | 0 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/node.py | 6 | ||||
| -rw-r--r-- | yardstick/cmd/commands/testcase.py | 10 | ||||
| -rw-r--r-- | yardstick/definitions.py | 5 | ||||
| -rw-r--r-- | yardstick/dispatcher/influxdb.py | 2 |
10 files changed, 24 insertions, 7 deletions
diff --git a/etc/__init__.py b/etc/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/etc/__init__.py @@ -23,6 +23,12 @@ setup( 'resources/files/*', 'resources/scripts/install/*.bash', 'resources/scripts/remove/*.bash' + ], + 'etc': [ + 'yardstick/nodes/*/*.yaml' + ], + 'tests': [ + 'opnfv/*/*.yaml' ] }, url="https://www.opnfv.org", diff --git a/tests/unit/dispatcher/test_influxdb_line_protocol.py b/tests/unit/dispatcher/test_influxdb_line_protocol.py index cb05bf4d2..42553c498 100644 --- a/tests/unit/dispatcher/test_influxdb_line_protocol.py +++ b/tests/unit/dispatcher/test_influxdb_line_protocol.py @@ -4,7 +4,7 @@ # influxdb-python/influxdb/tests/test_line_protocol.py import unittest -from yardstick.dispatcher.influxdb_line_protocol import make_lines +from third_party.influxdb.influxdb_line_protocol import make_lines class TestLineProtocol(unittest.TestCase): diff --git a/third_party/__init__.py b/third_party/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/third_party/__init__.py diff --git a/third_party/influxdb/__init__.py b/third_party/influxdb/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/third_party/influxdb/__init__.py diff --git a/yardstick/dispatcher/influxdb_line_protocol.py b/third_party/influxdb/influxdb_line_protocol.py index eee982163..eee982163 100644 --- a/yardstick/dispatcher/influxdb_line_protocol.py +++ b/third_party/influxdb/influxdb_line_protocol.py diff --git a/yardstick/benchmark/contexts/node.py b/yardstick/benchmark/contexts/node.py index c3d652119..c4e603a46 100644 --- a/yardstick/benchmark/contexts/node.py +++ b/yardstick/benchmark/contexts/node.py @@ -8,10 +8,12 @@ ############################################################################## import sys +import os import yaml import logging from yardstick.benchmark.contexts.base import Context +from yardstick.definitions import YARDSTICK_ROOT_PATH LOG = logging.getLogger(__name__) @@ -33,7 +35,9 @@ class NodeContext(Context): 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) diff --git a/yardstick/cmd/commands/testcase.py b/yardstick/cmd/commands/testcase.py index 5205eb93e..cb76c7ae3 100644 --- a/yardstick/cmd/commands/testcase.py +++ b/yardstick/cmd/commands/testcase.py @@ -8,13 +8,15 @@ ############################################################################## """ 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 +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. @@ -22,7 +24,7 @@ class TestcaseCommands(object): 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): diff --git a/yardstick/definitions.py b/yardstick/definitions.py new file mode 100644 index 000000000..300a78e58 --- /dev/null +++ b/yardstick/definitions.py @@ -0,0 +1,5 @@ +import os + +dirname = os.path.dirname +YARDSTICK_ROOT_PATH = dirname(dirname(os.path.abspath(__file__))) +YARDSTICK_ROOT_PATH += os.path.sep diff --git a/yardstick/dispatcher/influxdb.py b/yardstick/dispatcher/influxdb.py index e431f2c1e..8673253b4 100644 --- a/yardstick/dispatcher/influxdb.py +++ b/yardstick/dispatcher/influxdb.py @@ -16,7 +16,7 @@ import time from oslo_config import cfg from yardstick.dispatcher.base import Base as DispatchBase -from yardstick.dispatcher.influxdb_line_protocol import make_lines +from third_party.influxdb.influxdb_line_protocol import make_lines LOG = logging.getLogger(__name__) |