X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Futils.py;h=d52e27c15f6270ed1eb5b2e6e94431a17dd3d788;hb=05f2d66b34290fd2538f5c50e841db0b86616e77;hp=38fbda47f15b7661f40a896377c6a3a5feb9a67f;hpb=5ce3b6f8c8b3217091e51a6041455738603d90b8;p=yardstick.git diff --git a/yardstick/network_services/utils.py b/yardstick/network_services/utils.py index 38fbda47f..d52e27c15 100644 --- a/yardstick/network_services/utils.py +++ b/yardstick/network_services/utils.py @@ -30,7 +30,10 @@ OPTS = [ help='bin_path for VNFs location.'), cfg.StrOpt('trex_path', default=os.path.join(NSB_ROOT, 'trex/scripts'), - help='trex automation lib pathh.'), + help='trex automation lib path.'), + cfg.StrOpt('trex_client_lib', + default=os.path.join(NSB_ROOT, 'trex_client/stl'), + help='trex python library path.'), ] CONF.register_opts(OPTS, group="nsb") @@ -55,7 +58,7 @@ def provision_tool(connection, tool_path, tool_file=None): if tool_file: tool_path = os.path.join(tool_path, tool_file) bin_path = get_nsb_option("bin_path") - exit_status, stdout = connection.execute("which %s > /dev/null 2>&1" % tool_path)[:2] + exit_status = connection.execute("which %s > /dev/null 2>&1" % tool_path)[0] if exit_status == 0: return encodeutils.safe_decode(tool_path, incoming='utf-8').rstrip()