From 2741f49b3b5e92c5c31f44133fd458c4f15b5479 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Tue, 1 Aug 2017 19:56:00 +0530 Subject: Populate default param based on no-auth Based on no-auth customise the default parameter for onap-command. e.g. If "no-auth = true" then command should not add default parameter "onap-username, onap-password, msb-url and no-auth". Issue-Id: CLI-22 Change-Id: Ic9228feb1deb7e6f24eb9b9f0c8f15fd45364e94 Signed-off-by: subhash kumar singh --- framework/src/main/resources/default_input_parameters.yaml | 2 ++ framework/src/main/resources/onap.properties | 8 +++++++- framework/src/main/resources/schema-refresh.yaml | 6 ------ 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'framework/src/main/resources') diff --git a/framework/src/main/resources/default_input_parameters.yaml b/framework/src/main/resources/default_input_parameters.yaml index f1e299eb..4f0d419c 100644 --- a/framework/src/main/resources/default_input_parameters.yaml +++ b/framework/src/main/resources/default_input_parameters.yaml @@ -14,11 +14,13 @@ parameters: long_option: onap-password default_value: ${ONAP_PASSWORD} is_secured: true + is_optional: false - name: msb-url type: url description: Onap MSB url short_option: m long_option: msb-url + is_optional: false default_value: ${ONAP_MSB_URL} - name: help type: string diff --git a/framework/src/main/resources/onap.properties b/framework/src/main/resources/onap.properties index bf1cdae5..b8f08d3b 100644 --- a/framework/src/main/resources/onap.properties +++ b/framework/src/main/resources/onap.properties @@ -5,4 +5,10 @@ http.api_key_use_cookies=true cli.service_name=onap-cli cli.api_gateway=msb -cli.auth_service=auth \ No newline at end of file +cli.auth_service=auth + +# service section +cli.exclude_params_internal_cmd=onap-username,onap-password,msb-url,no-auth +cli.no_auth_disable_include_params_external_cmd=onap-username,onap-password,msb-url,no-auth +cli.no_auth_enable_exclude_params_external_cmd=onap-username,onap-password,no-auth +cli.no_auth_enable_include_params_external_cmd=msb-url \ No newline at end of file diff --git a/framework/src/main/resources/schema-refresh.yaml b/framework/src/main/resources/schema-refresh.yaml index ffa32424..f64b0545 100644 --- a/framework/src/main/resources/schema-refresh.yaml +++ b/framework/src/main/resources/schema-refresh.yaml @@ -5,12 +5,6 @@ service: no-auth: true name: onap-cli version: 1.0.0 -default_parameters: - exclude: - - onap-username - - onap-password - - msb-url - - no-auth results: direction: landscape attributes: -- cgit 1.2.3-korg