diff options
Diffstat (limited to 'framework/src/main')
4 files changed, 16 insertions, 16 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java index 29cdbce9..d90f000c 100644 --- a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java +++ b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java @@ -115,8 +115,8 @@ public class Constants { public static final String DEFAULT_PARAMETER_FILE_NAME = "default_input_parameters.yaml"; // Common parameters used across all commands. - public static final String DEAFULT_PARAMETER_USERNAME = "onap-username"; - public static final String DEAFULT_PARAMETER_PASS_WORD = "onap-password"; + public static final String DEAFULT_PARAMETER_USERNAME = "host-username"; + public static final String DEAFULT_PARAMETER_PASS_WORD = "host-password"; public static final String DEAFULT_PARAMETER_HOST_URL = "host-url"; public static final String DEFAULT_PARAMETER_HELP = "help"; public static final String DEFAULT_PARAMETER_VERSION = "version"; diff --git a/framework/src/main/resources/default_input_parameters.yaml b/framework/src/main/resources/default_input_parameters.yaml index c65f4d8d..7f06e2bd 100644 --- a/framework/src/main/resources/default_input_parameters.yaml +++ b/framework/src/main/resources/default_input_parameters.yaml @@ -1,18 +1,18 @@ open_cli_schema_version: 1.0 parameters: - - name: onap-username + - name: host-username type: string - description: Onap user name + description: Host user name short_option: u - long_option: onap-username - default_value: $s{env:ONAP_USERNAME} + long_option: host-username + default_value: $s{env:HOST_USERNAME} is_optional: false - - name: onap-password + - name: host-password type: string - description: Onap user password + description: Host user password short_option: p - long_option: onap-password - default_value: $s{env:ONAP_PASSWORD} + long_option: host-password + default_value: $s{env:HOST_PASSWORD} is_secured: true is_optional: false - name: host-url diff --git a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml b/framework/src/main/resources/onap-cli-schema/schema-validate.yaml index 5eb29f0b..55e61e58 100644 --- a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml +++ b/framework/src/main/resources/onap-cli-schema/schema-validate.yaml @@ -8,8 +8,8 @@ service: version: 1.0.0 default_parameters: exclude: - - onap-username - - onap-password + - host-username + - host-password - host-url - no-auth parameters: diff --git a/framework/src/main/resources/onap.properties b/framework/src/main/resources/onap.properties index a963b386..d73f1454 100644 --- a/framework/src/main/resources/onap.properties +++ b/framework/src/main/resources/onap.properties @@ -8,9 +8,9 @@ cli.api_gateway=msb cli.auth_service=auth # service section -cli.exclude_params_internal_cmd=onap-username,onap-password,host-url,no-auth -cli.no_auth_disable_include_params_external_cmd=onap-username,onap-password,host-url,no-auth -cli.no_auth_enable_exclude_params_external_cmd=onap-username,onap-password,no-auth +cli.exclude_params_internal_cmd=host-username,host-password,host-url,no-auth +cli.no_auth_disable_include_params_external_cmd=host-username,host-password,host-url,no-auth +cli.no_auth_enable_exclude_params_external_cmd=host-username,host-password,no-auth cli.no_auth_enable_include_params_external_cmd=host-url cli.http.basic.common_headers=x-auth-token,x-transaction-id,x-app-id @@ -23,7 +23,7 @@ cli.http.basic.common_headers.x-app-id.value=onap-cli # Service specific headers cli.http.basic.common_headers.sdc=user-id cli.http.basic.common_headers.sdc.user-id=USER_ID -cli.http.basic.common_headers.sdc.user-id.value=${onap-username} +cli.http.basic.common_headers.sdc.user-id.value=${host-username} #TODO mrkanag add support for aaf like defined above for basic #cli.service.auth=aaf |