From edf504a4071b1d9300f72c5d83a22cda3bf2dc67 Mon Sep 17 00:00:00 2001 From: xudan Date: Thu, 12 Jul 2018 22:17:39 -0400 Subject: Remove the yardstick_tag and functest_tag These 2 commands can't work now. Also there is no need to support them, so remove them. JIRA: DOVETAIL-695 Change-Id: I6707c7fc1d19fe06690cd14ef39f9d421d00a2bc Signed-off-by: xudan --- dovetail/run.py | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'dovetail') diff --git a/dovetail/run.py b/dovetail/run.py index 4f643758..b57f9eed 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -74,28 +74,6 @@ def run_test(testcase_list, logger): return duration -def validate_input(input_dict, check_dict, logger): - func_tag = input_dict['functest_tag'] - yard_tag = input_dict['yardstick_tag'] - # bott_tag = input_dict['bott_tag'] - valid_functest_tags = check_dict['valid_functest_tags'] - valid_yardstick_tags = check_dict['valid_yardstick_tags'] - if func_tag is not None and func_tag not in valid_functest_tags: - logger.error("The input option 'functest_tag' can't be '{}', " - "valid values are {}.".format(func_tag, - valid_functest_tags)) - raise SystemExit(EXIT_RUN_FAILED) - if yard_tag is not None and yard_tag not in valid_yardstick_tags: - logger.error("The input option 'yardstick_tag' can't be '{}', " - "valid values are {}.".format(yard_tag, - valid_yardstick_tags)) - raise SystemExit(EXIT_RUN_FAILED) - # if bott_tag is not None and bott_tag not in valid_tag: - # logger.error("The input option 'bott_tag' can't be {}, " - # "valid values are {}.".format(bott_tag, valid_tag)) - # raise SystemExit(1) - - def filter_config(input_dict, logger): cli_dict = dt_cfg.dovetail_config['cli'] configs = {} @@ -217,7 +195,6 @@ def check_hosts_file(logger): def parse_cli(logger=None, **kwargs): - validate_input(kwargs, dt_cfg.dovetail_config['validate_input'], logger) configs = filter_config(kwargs, logger) if configs is not None: dt_cfg.update_config(configs) -- cgit 1.2.3-korg