Merge "add docker build scripts for testing-scheduler"

[bottlenecks.git] / utils / parser.py

diff --git a/utils/parser.py b/utils/parser.py
index f130de4..c0c1072 100644 (file)
--- a/utils/parser.py
+++ b/utils/parser.py
@@ -42,8 +42,14 @@ 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.bottlenecks_config["yardstick_image_dir"] = \
+                common_config['yardstick_image_dir']
+            cls.bottlenecks_config["image_url"] = common_config['image_url']
+            cls.bottlenecks_config["yardstick_image_name"] = \
+                common_config['yardstick_image_name']
             cls.config_dir_check(cls.bottlenecks_config["log_dir"])
 
     @classmethod
@@ -83,15 +89,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
@@ -126,6 +132,15 @@ class Parser():
             f.write(json.dumps(data, f))
             f.write("\n")
 
+    @staticmethod
+    def str_to_list(str_org):
+        try:
+            data = str_org.split(',')
+        except AttributeError:
+            data = []
+            data.append(str_org)
+        return data
+
 
 class HeatTemplate_Parser():
     """parser a Heat template and a method to deploy template to a stack"""