Merge "VNF characterizaion scale_out test, untested"

[bottlenecks.git] / utils / parser.py

diff --git a/utils/parser.py b/utils/parser.py
index f130de4..ecd6bad 100644 (file)
--- a/utils/parser.py
+++ b/utils/parser.py
@@ -42,6 +42,7 @@ class Parser():
             cls.bottlenecks_config["fetch_os"] = common_config["fetch_os_file"]
             cls.bottlenecks_config["log_dir"] = common_config['log_dir']
             cls.bottlenecks_config["rc_dir"] = common_config['rc_dir']
+            cls.bottlenecks_config["pod_info"] = common_config['pod_info']
             cls.bottlenecks_config["yardstick_rc_dir"] = \
                 common_config['yardstick_rc_dir']
             cls.config_dir_check(cls.bottlenecks_config["log_dir"])
@@ -83,15 +84,15 @@ class Parser():
 
     @classmethod
     def testcase_out_dir(cls, testcase):
-        suffix_name = os.getenv("SUFFIX_STRING")
-        if suffix_name is None:
+        file_name = os.getenv("OUTPUT_FILE")
+        if file_name is None:
             file_suffix = time.strftime('%H_%M', time.localtime(time.time()))
+            suffix_name = "_" + str(file_suffix)
+            out_name = cls.bottlenecks_config["log_dir"] + testcase
+            outfile_name = out_name + suffix_name + ".out"
         else:
-            file_suffix = suffix_name
-        suffix_name = str(suffix_name)
-        suffix_name = "_" + suffix_name
-        out_name = cls.bottlenecks_config["log_dir"] + testcase + file_suffix
-        outfile_name = out_name + ".out"
+            out_name = str(file_name)
+            outfile_name = cls.bottlenecks_config["log_dir"] + out_name
         return outfile_name
 
     @staticmethod