3 files changed, 94 insertions, 2 deletions
diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
index 91f7e27f..538d8a8a 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
@@ -22,6 +22,7 @@ TestCenter REST APIs. This test supports Python 3.4
 import argparse
 import logging
 import os
+from conf import settings
 
 
 logger = logging.getLogger(__name__)
@@ -141,7 +142,7 @@ def main():
                                 dest="test_user_name")
     optional_named.add_argument("--results_dir",
                                 required=False,
-                                default="./Results",
+                                default=settings.getValue("TRAFFICGEN_STC_RESULTS_DIR"),
                                 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-rfc2544-throughput.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-throughput.py
index becf7877..239fd109 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2544-throughput.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-throughput.py
@@ -22,6 +22,7 @@ TestCenter command sequencer. This test supports Python 2.7.
 from __future__ import print_function
 import argparse
 import os
+from conf import settings
 
 
 def create_dir(path):
@@ -129,7 +130,7 @@ def main():
                                dest="test_session_name")
     optionalnamed.add_argument("--results_dir",
                                required=False,
-                               default="./Results",
+                               default=settings.getValue("TRAFFICGEN_STC_RESULTS_DIR"),
                                help="The directory to copy results to",
                                dest="results_dir")
     optionalnamed.add_argument("--csv_results_file_prefix",
diff --git a/tools/teststepstools.py b/tools/teststepstools.py
new file mode 100644
index 00000000..d39f7f40
--- /dev/null
+++ b/tools/teststepstools.py
@@ -0,0 +1,90 @@
+# Copyright 2016 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Various helper functions for step driven testcases
+"""
+
+import re
+import logging
+import subprocess
+import locale
+
+class TestStepsTools(object):
+    """ Various tools and functions used by step driven testcases
+    """
+    # Functions use nonstandard names to avoid conflicts with
+    # standard python keywords.
+    # pylint: disable=invalid-name
+    def __init__(self):
+        """ TestStepsTools initialization
+        """
+        self._logger = logging.getLogger(__name__)
+
+    def Assert(self, condition):
+        """ Evaluate given `condition' and raise AssertionError
+            in case, that evaluation fails
+        """
+        try:
+            assert self.Eval(condition)
+        except AssertionError:
+            self._logger.error('Condition %s is not True', condition)
+            raise
+
+        return True
+
+    @staticmethod
+    def validate_Assert(result, dummy_condition):
+        """ Validate evaluation of given `condition'
+        """
+        return result
+
+    @staticmethod
+    def Eval(expression):
+        """ Evaluate python `expression' and return its result
+        """
+        # pylint: disable=eval-used
+        return eval(expression)
+
+    @staticmethod
+    def validate_Eval(result, dummy_expression):
+        """ Validate result of python `expression' evaluation
+        """
+        return result is not None
+
+    @staticmethod
+    def Exec(command, regex=None):
+        """ Execute a shell `command' and return its output filtered
+            out by optional `regex' expression.
+        """
+        try:
+            output = subprocess.check_output(command, shell=True)
+        except OSError:
+            return None
+
+        output = output.decode(locale.getdefaultlocale()[1])
+
+        if regex:
+            for line in output.split('\n'):
+                result = re.findall(regex, line)
+                if result:
+                    return result
+            return []
+
+        return output
+
+    @staticmethod
+    def validate_Exec(result, dummy_command, dummy_regex=None):
+        """ validate result of shell `command' execution
+        """
+        return result is not None