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/test/resources/onap.properties | 8 +++++++- .../src/test/resources/sample-test-exclude-param.yaml | 4 ++-- .../src/test/resources/sample-test-include-exclude.yaml | 5 ++++- .../src/test/resources/sample-test-include-param.yaml | 2 +- .../test/resources/sample-test-invalid-exclude-noauth.yaml | 6 ++++++ .../test/resources/sample-test-invalid-include-noauth.yaml | 6 ++++++ .../test/resources/sample-test-schema-auth-required.yaml | 14 ++++++++++++++ 7 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml create mode 100644 framework/src/test/resources/sample-test-invalid-include-noauth.yaml create mode 100644 framework/src/test/resources/sample-test-schema-auth-required.yaml (limited to 'framework/src/test/resources') diff --git a/framework/src/test/resources/onap.properties b/framework/src/test/resources/onap.properties index beb24a3f..a6c991cd 100644 --- a/framework/src/test/resources/onap.properties +++ b/framework/src/test/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 diff --git a/framework/src/test/resources/sample-test-exclude-param.yaml b/framework/src/test/resources/sample-test-exclude-param.yaml index 3cfb62ac..970a185d 100644 --- a/framework/src/test/resources/sample-test-exclude-param.yaml +++ b/framework/src/test/resources/sample-test-exclude-param.yaml @@ -1,5 +1,5 @@ onap_cmd_schema_version: 1.0 default_parameters: exclude: - - onap-username - - msb-url \ No newline at end of file + - long + - format diff --git a/framework/src/test/resources/sample-test-include-exclude.yaml b/framework/src/test/resources/sample-test-include-exclude.yaml index 22d05c47..a1494bfe 100644 --- a/framework/src/test/resources/sample-test-include-exclude.yaml +++ b/framework/src/test/resources/sample-test-include-exclude.yaml @@ -2,5 +2,8 @@ onap_cmd_schema_version: 1.0 default_parameters: include: - onap-username + - onap-password + - msb-url + - no-auth exclude: - - msb-url \ No newline at end of file + - long diff --git a/framework/src/test/resources/sample-test-include-param.yaml b/framework/src/test/resources/sample-test-include-param.yaml index 0dc76bbc..ecc737c7 100644 --- a/framework/src/test/resources/sample-test-include-param.yaml +++ b/framework/src/test/resources/sample-test-include-param.yaml @@ -3,4 +3,4 @@ default_parameters: include: - onap-username - onap-password - - msb-url \ No newline at end of file + - no-auth diff --git a/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml b/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml new file mode 100644 index 00000000..bad12e60 --- /dev/null +++ b/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml @@ -0,0 +1,6 @@ +onap_cmd_schema_version: 1.0 +service: + no-auth: false +default_parameters: + exclude: + - onap-username \ No newline at end of file diff --git a/framework/src/test/resources/sample-test-invalid-include-noauth.yaml b/framework/src/test/resources/sample-test-invalid-include-noauth.yaml new file mode 100644 index 00000000..c4384ca0 --- /dev/null +++ b/framework/src/test/resources/sample-test-invalid-include-noauth.yaml @@ -0,0 +1,6 @@ +onap_cmd_schema_version: 1.0 +service: + no-auth: true +default_parameters: + include: + - onap-username \ No newline at end of file diff --git a/framework/src/test/resources/sample-test-schema-auth-required.yaml b/framework/src/test/resources/sample-test-schema-auth-required.yaml new file mode 100644 index 00000000..4df6445a --- /dev/null +++ b/framework/src/test/resources/sample-test-schema-auth-required.yaml @@ -0,0 +1,14 @@ +onap_cmd_schema_version: 1.0 +name: sample-test +description: Onap sample command to test the command features +service: + name: sample + version: v1 +parameters: + - name: bool-param + type: bool + description: Onap boolean param, by default its always false. + short_option: b + long_option: bool + is_optional: true + default_value: false \ No newline at end of file -- cgit 1.2.3-korg