summaryrefslogtreecommitdiffstats
path: root/tools/pkt_gen
diff options
context:
space:
mode:
authorSridhar K. N. Rao <sridhar.rao@spirent.com>2017-02-22 14:07:29 +0530
committerSridhar K. N. Rao <sridhar.rao@spirent.com>2017-02-22 14:07:29 +0530
commite47c461e0f93d5517045aa36f56e52624a82fbd8 (patch)
tree4c23c4d9dcaec5629ddc15c20548771e2507b37c /tools/pkt_gen
parent681dd54cd02cc9e89f26f2799680bfe6eac5ef51 (diff)
pkt_gen: STC parameter reordering bug.
This patch fixes a bug caused due to wrong parameter ordering. stc_common_settings should come after rfc2544_common_settings. It also gets rid of 'Import' error for module 'conf' JIRA: VSPERF-491 Change-Id: I356294b4efdf9ebd0cea4492d3ed1cb8e04ec9b1 Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Diffstat (limited to 'tools/pkt_gen')
-rw-r--r--tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py3
-rw-r--r--tools/pkt_gen/testcenter/testcenter.py6
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
index 476e4e69..6c30b130 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
@@ -24,7 +24,6 @@ TestCenter REST APIs. This test supports Python 3.4
import argparse
import logging
import os
-from conf import settings
_LOGGER = logging.getLogger(__name__)
@@ -144,7 +143,7 @@ def main():
dest="test_user_name")
optional_named.add_argument("--results_dir",
required=False,
- default=settings.getValue("TRAFFICGEN_STC_RESULTS_DIR"),
+ default="./Results",
help="The directory to copy results to",
dest="results_dir")
optional_named.add_argument("--csv_results_file_prefix",
diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index deb14e7e..9980ae7c 100644
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -385,7 +385,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
rfc2544_common_args = get_rfc2544_common_settings()
rfc2544_custom_args = get_rfc2544_custom_settings(framesize,
custom, 1)
- args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+ args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
args.append("--verbose")
@@ -418,7 +418,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
rfc2544_common_args = get_rfc2544_common_settings()
rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
tests)
- args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+ args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
args.append("--verbose")
@@ -451,7 +451,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
rfc2544_common_args = get_rfc2544_common_settings()
rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '',
tests)
- args = stc_common_args + rfc2544_common_args + rfc2544_custom_args
+ args = rfc2544_common_args + stc_common_args + rfc2544_custom_args
if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True":
args.append("--verbose")