From 1ecc057676a6ef788d5193261abd98bd364f10c0 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 20 Sep 2017 16:34:10 +0530 Subject: Migrate onap-username and onap-password onap-username and onap-password are migrated into host-username and host-password respectively Issue-Id: CLI-66 Change-Id: I4d658283523e75a2223dac9d0b839fdbc6ae2da3 Signed-off-by: Kanagaraj Manickam k00365106 --- README.md | 12 +++++----- deployment/http/web/index.html | 26 ---------------------- docs/open_cli_schema_version_1_0.rst | 18 +++++++-------- .../main/java/org/onap/cli/fw/conf/Constants.java | 4 ++-- .../main/resources/default_input_parameters.yaml | 16 ++++++------- .../resources/onap-cli-schema/schema-validate.yaml | 4 ++-- framework/src/main/resources/onap.properties | 8 +++---- .../org/onap/cli/fw/cmd/OnapHttpCommandTest.java | 8 +++---- .../cli/fw/cmd/OnapSchemaValidateCommandTest.java | 8 +++---- .../TestDefaultParameterSection.java | 16 ++++++------- .../src/test/resources/sample-cmd-test-help.txt | 10 ++++----- .../resources/sample-test-include-exclude.yaml | 4 ++-- .../test/resources/sample-test-include-param.yaml | 4 ++-- .../sample-test-invalid-exclude-noauth.yaml | 2 +- .../sample-test-invalid-include-noauth.yaml | 2 +- main/src/main/resources/onap-readme.txt | 4 ++-- .../java/org/onap/cli/main/OnapCliMainTest.java | 4 ++-- .../org/onap/cli/main/utils/OnapCliUtilsTest.java | 18 +++++++-------- .../onap-cli-sample/vsp/vsp-checkin-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-checkout-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-create-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-list-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-show-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-submit-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-upload-sample.yaml | 2 +- 25 files changed, 78 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 4762d07d..d2abd5ef 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ Provides unified commands to operate ONAP from Linux console. Configure the following environment variables, before using it: 1. **HOST_URL** - Onap Micro service bus(MSB) URL or a service URL -2. **ONAP_USERNAME** - Onap user name -3. **ONAP_PASSWORD** - Onap user password +2. **HOST_USERNAME** - Onap user name +3. **HOST_PASSWORD** - Onap user password To Run a command ----------------- @@ -20,9 +20,9 @@ Type **onap** from linux console. And use the directive set to set the values for following parameters: -1. **host-url** - Onap Micro service bus(MSB) URL or a service URL -2. **onap-username** - Onap user name -3. **onap-password** - Onap user password +1. **onap-host-url** - Onap Micro service bus(MSB) URL or a service URL +2. **host-username** - Onap user name +3. **host-password** - Onap user password Set the product version ------------------------ @@ -52,4 +52,4 @@ To run in debug mode, set following environment variables: More details ------------- -https://wiki.onap.org \ No newline at end of file +https://wiki.onap.org diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html index 1bc23d76..f722b657 100644 --- a/deployment/http/web/index.html +++ b/deployment/http/web/index.html @@ -8,31 +8,5 @@ function redirectToConsole(){ -

ONAP Command-Line Interface (CLI)

- -

Provides unified commands to operate ONAP from Linux shell and web-console. - -

Web Command Console

To open web command console for ONAP, -Click here ! - -

Linux Command Console

Please follow the instructions given below for installing ONAP CLI.

Download ONAP CLI from here
Unzip into folder /opt/onap/cli
Initialize CLI by running /opt/onap/cli/cli-init.sh
Run ONAP CLI, by typing onap from command line -
For more details, refer /opt/onap/cli/README.md

-
- -_{One Command to command whole Onap !!} -

Powered by Open CLI Platform (OCLIP) -1.0 -

diff --git a/docs/open_cli_schema_version_1_0.rst b/docs/open_cli_schema_version_1_0.rst index f2e1d66a..42053730 100644 --- a/docs/open_cli_schema_version_1_0.rst +++ b/docs/open_cli_schema_version_1_0.rst @@ -474,7 +474,7 @@ OCLIP platform provides following default parameters for every command and author is allowed to customize the inclusion or exclusion of these input parameters for a given command. -name: onap-username +name: host-username ~~~~~~~~~~~~~~~~~~~ type: string @@ -483,13 +483,13 @@ name: onap-username short_option: u - long_option: onap-username + long_option: host-username - default_value: ${ONAP_USERNAME} + default_value: ${HOST_USERNAME} is_optional: false -name: onap-password +name: host-password ~~~~~~~~~~~~~~~~~~~ type: string @@ -498,9 +498,9 @@ name: onap-password short_option: p - long_option: onap-password + long_option: host-password - default_value: ${ONAP_PASSWORD} + default_value: ${HOST_PASSWORD} is_secured: true @@ -611,15 +611,15 @@ and logout. For example, OCLIP platform provides a command called 'schema-validate' to validate schematics of template against the specification defined in this -document. For this command, host-url, onap-username, onap-password, no-auth +document. For this command, host-url, host-username, host-password, no-auth parameters are required. so author could exclude these parameters by defining as : default_parameters: exclude: - \- onap-username + \- host-username - \- onap-password + \- host-password \- host-url 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 diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java index bfdb14a5..7552cacb 100644 --- a/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java +++ b/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java @@ -31,12 +31,12 @@ public class OnapHttpCommandTest { @Test(expected = OnapCommandException.class) public void runTest() throws OnapCommandException { OnapCommandParameter param1 = new OnapCommandParameter(); - param1.setLongOption("onap-username"); - param1.setName("onap-username"); + param1.setLongOption("host-username"); + param1.setName("host-username"); param1.setParameterType(ParameterType.STRING); OnapCommandParameter param2 = new OnapCommandParameter(); - param2.setLongOption("onap-password"); - param2.setName("onap-password"); + param2.setLongOption("host-password"); + param2.setName("host-password"); param2.setParameterType(ParameterType.STRING); OnapCommandParameter param3 = new OnapCommandParameter(); param3.setLongOption("host-url"); diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java index 89c32c99..2355d668 100644 --- a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java +++ b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java @@ -28,9 +28,9 @@ public class OnapSchemaValidateCommandTest { OnapSchemaValidateCommand cmd = new OnapSchemaValidateCommand(); cmd.initializeSchema("schema-validate.yaml"); for (OnapCommandParameter param : cmd.getParameters()) { - if ("onap-username".equals(param.getName())) { + if ("host-username".equals(param.getName())) { param.setValue("test"); - } else if ("onap-password".equals(param.getName())) { + } else if ("host-password".equals(param.getName())) { param.setValue("test"); } else if ("host-url".equals(param.getName())) { param.setValue("test-url"); @@ -48,9 +48,9 @@ public class OnapSchemaValidateCommandTest { OnapSchemaValidateCommand cmd = new OnapSchemaValidateCommand(); cmd.initializeSchema("schema-validate.yaml"); for (OnapCommandParameter param : cmd.getParameters()) { - if ("onap-username".equals(param.getName())) { + if ("host-username".equals(param.getName())) { param.setValue("test"); - } else if ("onap-password".equals(param.getName())) { + } else if ("host-password".equals(param.getName())) { param.setValue("test"); } else if ("host-url".equals(param.getName())) { param.setValue("test-url"); diff --git a/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java b/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java index 20ca10f7..b0590791 100644 --- a/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java +++ b/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java @@ -41,8 +41,8 @@ public class TestDefaultParameterSection { OnapCommandUtils.loadSchema(cmd, "sample-test-include-param.yaml", true, false); List parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList()); - assertTrue(parameters.contains("onap-username")); - assertTrue(parameters.contains("onap-password")); + assertTrue(parameters.contains("host-username")); + assertTrue(parameters.contains("host-password")); assertTrue(parameters.contains("host-url")); } @@ -55,8 +55,8 @@ public class TestDefaultParameterSection { OnapCommandUtils.loadSchema(cmd, "sample-test-exclude-param.yaml", true, false); List parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList()); - assertTrue(parameters.contains("onap-username")); - assertTrue(parameters.contains("onap-password")); + assertTrue(parameters.contains("host-username")); + assertTrue(parameters.contains("host-password")); assertTrue(parameters.contains("host-url")); assertFalse(parameters.contains("long")); assertFalse(parameters.contains("format")); @@ -73,8 +73,8 @@ public class TestDefaultParameterSection { OnapCommandUtils.loadSchema(cmd, "sample-test-include-exclude.yaml", true, false); List parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList()); - assertTrue(parameters.contains("onap-username")); - assertTrue(parameters.contains("onap-password")); + assertTrue(parameters.contains("host-username")); + assertTrue(parameters.contains("host-password")); assertTrue(parameters.contains("host-url")); } @@ -88,8 +88,8 @@ public class TestDefaultParameterSection { OnapCommandUtils.loadSchema(cmd, "onap-test-schema.yaml", true, false); List parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList()); - assertFalse(parameters.contains("onap-username")); - assertFalse(parameters.contains("onap-password")); + assertFalse(parameters.contains("host-username")); + assertFalse(parameters.contains("host-password")); assertTrue(parameters.contains("host-url")); assertTrue(parameters.contains("debug")); assertTrue(parameters.contains("long")); diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt index 074e833e..3d3d2415 100644 --- a/framework/src/test/resources/sample-cmd-test-help.txt +++ b/framework/src/test/resources/sample-cmd-test-help.txt @@ -5,7 +5,7 @@ Onap sample command to test the command features Onap service: sample v1 Options: -[-u | --onap-username] [-p | --onap-password] [-m | --host-url] +[-u | --host-username] [-p | --host-password] [-m | --host-url] [-h | --help] [-v | --version] [-d | --debug] [-f | --format] [-s | --long] [-t | --no-title] [-a | --no-auth] [-b | --bool] [-x | --secure] @@ -13,12 +13,12 @@ Options: [-l | --long-opt] [-r | --url] [-z | --env] where, --u | --onap-username Onap user name. It is of type STRING. By +-u | --host-username Onap user name. It is of type STRING. By default, it is read from environment variable - ONAP_USERNAME. --p | --onap-password Onap user password. It is of type STRING. By + HOST_USERNAME. +-p | --host-password Onap user password. It is of type STRING. By default, it is read from environment variable - ONAP_PASSWORD. Secured. + HOST_PASSWORD. Secured. -m | --host-url Onap MSB url. It is of type URL. By default, it is read from environment variable ONAP_MSB_URL. -h | --help Onap command help message. It is of type STRING. diff --git a/framework/src/test/resources/sample-test-include-exclude.yaml b/framework/src/test/resources/sample-test-include-exclude.yaml index 77d3211c..3568372b 100644 --- a/framework/src/test/resources/sample-test-include-exclude.yaml +++ b/framework/src/test/resources/sample-test-include-exclude.yaml @@ -1,8 +1,8 @@ open_cli_schema_version: 1.0 default_parameters: include: - - onap-username - - onap-password + - host-username + - host-password - host-url - no-auth exclude: diff --git a/framework/src/test/resources/sample-test-include-param.yaml b/framework/src/test/resources/sample-test-include-param.yaml index 18097129..38e5149e 100644 --- a/framework/src/test/resources/sample-test-include-param.yaml +++ b/framework/src/test/resources/sample-test-include-param.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 default_parameters: include: - - onap-username - - onap-password + - host-username + - host-password - 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 index 1a42b8d4..c1584116 100644 --- a/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml +++ b/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml @@ -1,4 +1,4 @@ open_cli_schema_version: 1.0 default_parameters: exclude: - - onap-username \ No newline at end of file + - host-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 index 2d53ab11..1dda3b96 100644 --- a/framework/src/test/resources/sample-test-invalid-include-noauth.yaml +++ b/framework/src/test/resources/sample-test-invalid-include-noauth.yaml @@ -3,4 +3,4 @@ service: auth: none default_parameters: include: - - onap-username \ No newline at end of file + - host-username \ No newline at end of file diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/onap-readme.txt index 668d7584..0795cf5e 100644 --- a/main/src/main/resources/onap-readme.txt +++ b/main/src/main/resources/onap-readme.txt @@ -13,8 +13,8 @@ to access and operate Onap functionalities. To use this CLI, please configure the following environment variables: 1. ONAP_MSB_URL - Onap Micro service bus(MSB) URL -2. ONAP_USERNAME - Onap user name -3. ONAP_PASSWORD - Onap user password +2. HOST_USERNAME - Onap user name +3. HOST_PASSWORD - Onap user password To know the CLI version, type onap [-v|--version] To know the CLI usage, type onap [-h|--help] diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java index 092ef8d8..0ac00d1f 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java @@ -136,8 +136,8 @@ public class OnapCliMainTest { @Test public void testHandleSampleCommandSet() throws OnapCommandException { OnapCommandRegistrar.getRegistrar().addParamCache("sample:string-param", "paramValue"); - OnapCommandRegistrar.getRegistrar().addParamCache("onap-username", "paramValue"); - OnapCommandRegistrar.getRegistrar().addParamCache("onap-password", "paramValue"); + OnapCommandRegistrar.getRegistrar().addParamCache("host-username", "paramValue"); + OnapCommandRegistrar.getRegistrar().addParamCache("host-password", "paramValue"); OnapCommandRegistrar.getRegistrar().addParamCache("host-url", "paramValue"); this.handle(new String[] { "sample-test", "--string-param", "test"}); } diff --git a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java index 622cea5f..1ea1a22d 100644 --- a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java +++ b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java @@ -34,12 +34,12 @@ public class OnapCliUtilsTest { @Test public void testpopulateParamsLong() throws OnapCommandException { OnapCommandParameter param1 = new OnapCommandParameter(); - param1.setLongOption("onap-username"); - param1.setName("onap-username"); + param1.setLongOption("host-username"); + param1.setName("host-username"); param1.setParameterType(ParameterType.STRING); OnapCommandParameter param2 = new OnapCommandParameter(); - param2.setLongOption("onap-password"); - param2.setName("onap-password"); + param2.setLongOption("host-password"); + param2.setName("host-password"); param2.setParameterType(ParameterType.STRING); OnapCommandParameter param3 = new OnapCommandParameter(); param3.setLongOption("host-url"); @@ -61,13 +61,13 @@ public class OnapCliUtilsTest { paramslist.add(param4); paramslist.add(param5); - String[] args = new String[] { "sample-create", "--onap-username", "admin", "--onap-password", "123", + String[] args = new String[] { "sample-create", "--host-username", "admin", "--host-password", "123", "--host-url", "a@b.com", "--string-param", "blah", "--long-opt", "10" }; OnapCliUtils.populateParams(paramslist, Arrays.asList(args)); List expectedList = Arrays.asList(args); - Assert.assertEquals("onap-username", expectedList.get(2), param1.getValue()); - Assert.assertEquals("onap-password", expectedList.get(4), param2.getValue()); + Assert.assertEquals("host-username", expectedList.get(2), param1.getValue()); + Assert.assertEquals("host-password", expectedList.get(4), param2.getValue()); Assert.assertEquals("host-url", expectedList.get(6), param3.getValue()); Assert.assertEquals("string-param", expectedList.get(8), param4.getValue()); Assert.assertEquals("long-opt", expectedList.get(10), param5.getValue()); @@ -184,11 +184,11 @@ public class OnapCliUtilsTest { OnapCommandParameter param1 = new OnapCommandParameter(); param1.setShortOption("u"); - param1.setName("onap-username"); + param1.setName("host-username"); param1.setParameterType(ParameterType.STRING); OnapCommandParameter param2 = new OnapCommandParameter(); param2.setShortOption("p"); - param2.setName("onap-password"); + param2.setName("host-password"); param2.setParameterType(ParameterType.STRING); OnapCommandParameter param3 = new OnapCommandParameter(); param3.setShortOption("r"); diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml index c5d64917..43023fe6 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml @@ -5,4 +5,4 @@ version: onap-1.0 samples: sample1: name: Checkin the Vendor Software Product - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml index cbc689fc..d7a9e375 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-sample.yaml @@ -6,4 +6,4 @@ version: onap-1.1 samples: sample1: name: Checkout the Vendor Software Product - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml index c96a76fd..d5b7432f 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml @@ -5,7 +5,7 @@ version: onap-1.0 samples: sample1: name: Create the Vendor Software Product - input: --onap-username cs0008 --onap-password demo123456! --host-url http://locahost:8080 --vsp-name demo-vsp2 --vsp-vendor-name 5aa8a88c --vsp-vendor-id DBB202617952486691C1E35C9 621CD4E --license-agreement-id E19DBDDB137B494385F9535325BFD585 --feature-group-id 94835F096DAF4ED78781A394A4F22AD1 + input: --host-username cs0008 --host-password demo123456! --host-url http://locahost:8080 --vsp-name demo-vsp2 --vsp-vendor-name 5aa8a88c --vsp-vendor-id DBB202617952486691C1E35C9 621CD4E --license-agreement-id E19DBDDB137B494385F9535325BFD585 --feature-group-id 94835F096DAF4ED78781A394A4F22AD1 output: | +----------+----------------------------------+ |property |value | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml index 4cfa64af..fe494ace 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml @@ -5,7 +5,7 @@ version: onap-1.0 samples: sample1: name: List Vendor Software Products - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 output: | +----------------------------------+------------+ |ID |name | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml index 4938c0cb..99cd88ed 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml @@ -5,7 +5,7 @@ version: onap-1.0 samples: sample1: name: Show the details of Vendor Software Products - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 --vsp-id 2DEB6CB4B082415BB7A697C9CD1273BA + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id 2DEB6CB4B082415BB7A697C9CD1273BA output: | +----------+----------------------------------+--------------------------+ |name |ID |description | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml index 568fdf72..55ceaf32 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml @@ -5,4 +5,4 @@ version: onap-1.0 samples: sample1: name: Submit the Vendor Software Product - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml index 1fd10340..344dcc9e 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml @@ -5,4 +5,4 @@ version: onap-1.0 samples: sample1: name: upload the zip file to Vendor Software Product - input: --onap-username cs0008 --onap-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 --vsp-file /home/user/vFW.zip + input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 --vsp-file /home/user/vFW.zip -- cgit 1.2.3-korg