1 files changed, 39 insertions, 5 deletions

diff --git a/dovetail/run.py b/dovetail/run.py
index ddeb3117..39dec07c 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -18,6 +18,8 @@ from testcase import Testcase
 from testcase import Scenario
 from report import Report
 from conf.dovetail_config import SCENARIO_NAMING_FMT
+from conf.dovetail_config import dovetail_config
+from conf.dovetail_config import update_envs
 
 logger = dt_logger.Logger('run.py').getLogger()
 
@@ -69,17 +71,49 @@ def run_test(scenario):
         Report.check_result(testcase, db_result)
 
 
-@click.command()
-@click.option('--scenario', default='basic', help='certification scenario')
-def main(scenario):
+def filter_env_options(input_dict):
+    envs_options = {}
+    for key, value in input_dict.items():
+        key = key.upper()
+        if key in dovetail_config['cli']['options']['envs']:
+            envs_options[key] = value
+    return envs_options
+
+
+def main(*args, **kwargs):
     """Dovetail certification test entry!"""
     logger.info('=======================================')
-    logger.info('Dovetail certification: %s!' % scenario)
+    logger.info('Dovetail certification: %s!' % (kwargs['scenario']))
     logger.info('=======================================')
+    envs_options = filter_env_options(kwargs)
+    update_envs(envs_options)
+    logger.info('Your new envs for functest: %s' %
+                dovetail_config['functest']['envs'])
+    logger.info('Your new envs for yardstick: %s' %
+                dovetail_config['yardstick']['envs'])
     load_testcase()
-    scenario_yaml = load_scenario(scenario)
+    scenario_yaml = load_scenario(kwargs['scenario'])
     run_test(scenario_yaml)
     Report.generate(scenario_yaml)
 
+
+CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+if dovetail_config['cli']['options'] is not None:
+    for key, value in dovetail_config['cli']['options'].items():
+        if value is not None:
+            for k, v in value.items():
+                flags = v['flags']
+                del v['flags']
+                main = click.option(*flags, **v)(main)
+if dovetail_config['cli']['arguments'] is not None:
+    for key, value in dovetail_config['cli']['arguments'].items():
+        if value is not None:
+            for k, v in value.items():
+                flags = v['flags']
+                del v['flags']
+                main = click.argument(flags, **v)(main)
+main = click.command(context_settings=CONTEXT_SETTINGS)(main)
+
+
 if __name__ == '__main__':
     main()