X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fparser.py;h=f130de445bf84d85289c1b06f98db67aacff5fa3;hb=904396874f08208bde66c953fcfe31906a6588d1;hp=48f705b0407b951f0a5a6addf5434f43811d1956;hpb=1760c89637ac71b877a17896e5768640a20360c3;p=bottlenecks.git

diff --git a/utils/parser.py b/utils/parser.py
index 48f705b0..f130de44 100644
--- a/utils/parser.py
+++ b/utils/parser.py
@@ -17,6 +17,7 @@ import yaml
 import json
 import time
 from pyroute2 import IPDB
+import utils.infra_setup.runner.docker_env as docker_env
 
 
 class Parser():
@@ -41,6 +42,8 @@ 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["yardstick_rc_dir"] = \
+                common_config['yardstick_rc_dir']
             cls.config_dir_check(cls.bottlenecks_config["log_dir"])
 
     @classmethod
@@ -49,7 +52,7 @@ class Parser():
             cls.test_dir,
             testcase,
             'testsuite_story',
-            story_name)
+            story_name + '.yaml')
         with open(story_dir) as file:
             story_parser = yaml.load(file)
         for case_name in story_parser['testcase']:
@@ -80,8 +83,14 @@ class Parser():
 
     @classmethod
     def testcase_out_dir(cls, testcase):
-        file_time = time.strftime('%H_%M', time.localtime(time.time()))
-        out_name = cls.bottlenecks_config["log_dir"] + testcase + file_time
+        suffix_name = os.getenv("SUFFIX_STRING")
+        if suffix_name is None:
+            file_suffix = time.strftime('%H_%M', time.localtime(time.time()))
+        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"
         return outfile_name
 
@@ -92,6 +101,15 @@ class Parser():
         # TO-DO add cli parameters to stack_config.
         return test_cfg, stack_cfg
 
+    @staticmethod
+    def convert_docker_env(config, ip_type):
+        if ip_type is "dashboard":
+            config["contexts"]["dashboard_ip"] = \
+                docker_env.ELK_info["ip"] + ":9200"
+        elif ip_type is "yardstick":
+            config["contexts"]["yardstick_ip"] = \
+                docker_env.yardstick_info["ip"] + ":8888"
+
     @staticmethod
     def ip_parser(ip_type):
         with IPDB() as ip: