summaryrefslogtreecommitdiffstats
path: root/vsperf
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2016-12-01 14:21:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-01 14:21:29 +0000
commit964d1bffc8ac4c85ba05f4c5a2cb1fa9b10f6b6b (patch)
treedb9637906c7dece208fa9b9e6db31e077ef29278 /vsperf
parent501943ab19621a71efa1782cb4ac905e2c1db4df (diff)
parent32a2593e6b7735bcbd0e6e28cd57e93fb7dccb34 (diff)
Merge "yardstick: CLI params support for yardstick TCs"
Diffstat (limited to 'vsperf')
-rwxr-xr-xvsperf7
1 files changed, 4 insertions, 3 deletions
diff --git a/vsperf b/vsperf
index ee494dcd..385f7929 100755
--- a/vsperf
+++ b/vsperf
@@ -504,8 +504,11 @@ def main():
# than both a settings file and environment variables
settings.load_from_dict(args)
+ settings.setValue('mode', args['mode'])
+
# set dpdk and ovs paths accorfing to VNF and VSWITCH
- functions.settings_update_paths()
+ if settings.getValue('mode') != 'trafficgen':
+ functions.settings_update_paths()
# if required, handle list-* operations
handle_list_options(args)
@@ -584,8 +587,6 @@ def main():
# for backward compatibility
settings.setValue('WHITELIST_NICS', list(nic['pci'] for nic in nic_list))
- settings.setValue('mode', args['mode'])
-
# generate results directory name
date = datetime.datetime.fromtimestamp(time.time())
results_dir = "results_" + date.strftime('%Y-%m-%d_%H-%M-%S')