diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-01-26 11:19:25 -0800 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-02-08 06:50:49 +0000 |
| commit | 1267052bbc7dc3921c429ab299f6335dbe709dc7 (patch) | |
| tree | 2eff939bf46bb606b1750ca9efba817965774031 /yardstick/network_services | |
| parent | a4241e6e9b121447a50fdfe0d79b322c2e2aaea9 (diff) | |
nsb: move NSB root to constant, add unittest
add unittest for non-None default
fixup get_nsb_option to return default correctly.
use NSB_ROOT for all paths
Change-Id: Idd1951a8d436bc49c30d59d84ca12a5f26e9148f
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick/network_services')
| -rw-r--r-- | yardstick/network_services/utils.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/yardstick/network_services/utils.py b/yardstick/network_services/utils.py index b75091326..cb71a6029 100644 --- a/yardstick/network_services/utils.py +++ b/yardstick/network_services/utils.py @@ -15,18 +15,21 @@ from __future__ import absolute_import import logging +import os from oslo_config import cfg from oslo_config.cfg import NoSuchOptError from oslo_utils import encodeutils +NSB_ROOT = "/opt/nsb_bin" + CONF = cfg.CONF OPTS = [ cfg.StrOpt('bin_path', - default='/opt/nsb_bin', + default=NSB_ROOT, help='bin_path for VNFs location.'), cfg.StrOpt('trex_path', - default='/opt/nsb_bin/trex/scripts', + default=os.path.join(NSB_ROOT, 'trex/scripts'), help='trex automation lib pathh.'), ] CONF.register_opts(OPTS, group="nsb") @@ -39,8 +42,7 @@ def get_nsb_option(option, default=None): return CONF.nsb.__getitem__(option) except NoSuchOptError: logging.debug("Invalid key %s", option) - else: - return default + return default def provision_tool(connection, tool_path): |