From e7f2f7c02b79e27f548417aa9266a1defb8a2cbf Mon Sep 17 00:00:00 2001 From: Marc Gueury Date: Thu, 11 Jan 2024 19:51:59 +0100 Subject: [PATCH] v2.0 --- py_oci_starter.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/py_oci_starter.py b/py_oci_starter.py index e78427b2..0e31bf65 100755 --- a/py_oci_starter.py +++ b/py_oci_starter.py @@ -57,8 +57,8 @@ def prog_arg_dict(): MANDATORY_OPTIONS = { - CLI: ['language', 'deploy_type'], - GROUP: ['group_name','group_common'] + CLI: ['-language', '-deploy_type'], + GROUP: ['-group_name','-group_common'] } def mandatory_options(mode): @@ -1105,10 +1105,11 @@ def jinja2_replace_template(): mode = get_mode() unknown_params = missing_parameters(allowed_options(), prog_arg_dict().keys()) illegal_params = check_values() +dash_params={f'-{k}': v for k, v in params.items()} if 'group_name' in params: - missing_params = missing_parameters(params.keys(), mandatory_options(GROUP)) + missing_params = missing_parameters(dash_params.keys(), mandatory_options(GROUP)) else: - missing_params = missing_parameters(params.keys(), mandatory_options(mode)) + missing_params = missing_parameters(dash_params.keys(), mandatory_options(mode)) if len(unknown_params) > 0 or len(illegal_params) > 0 or len(missing_params) > 0: mode = ABORT