diff options
| author |   Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-08-29 18:15:10 +0530 |
|---|---|---|
| committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-08-30 11:02:07 +0530 |
| commit | a4cd2403a5a171d6ab6aa6b1b0b1aae83345121b (patch) | |
| tree | 21646bed2f1dd2974ed24756c1f04855362219eb /main | |
| parent | 56ecabe9f1e7fca51d919df2836811b378c0e7df (diff) | |
Add versioning for command
By allowing to add version to the YAML, helps to
create same command for multiple versions of
product say onap 1.0, 1.1
CLI-37
Change-Id: Ic3982ea912045ff4f422fcf093cbd98ecd99716d
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'main')
5 files changed, 9 insertions, 4 deletions
diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index 05daf116..2695c3f7 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -86,7 +86,7 @@ public class OnapCli { if ((args.isEmpty()) || ((args.size() == 1) && (this.getLongOption(OnapCliConstants.PARAM_HELP_LOGN).equals(args.get(0)) || this.getShortOption(OnapCliConstants.PARAM_HELP_SHORT).equals(args.get(0))))) { - this.print(IOUtils.toString(this.getClass().getClassLoader().getResourceAsStream("onap-readme.txt"))); + this.print(IOUtils.toString(this.getClass().getClassLoader().getResourceAsStream("README.md"))); String help = OnapCommandRegistrar.getRegistrar().getHelp(); this.print(help); this.exitSuccessfully(); @@ -173,7 +173,7 @@ public class OnapCli { private ConsoleReader createConsoleReader() throws IOException { ConsoleReader console = new ConsoleReader(); try { - StringCompleter strCompleter = new StringCompleter(OnapCommandRegistrar.getRegistrar().listCommands()); + StringCompleter strCompleter = new StringCompleter(OnapCommandRegistrar.getRegistrar().listCommandsForEnabledProductVersion()); strCompleter.add(OnapCliConstants.PARAM_INTERACTIVE_EXIT, OnapCliConstants.PARAM_INTERACTIVE_CLEAR); console.addCompleter(strCompleter); diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/onap-readme.txt index 737cd04d..1008737b 100644 --- a/main/src/main/resources/onap-readme.txt +++ b/main/src/main/resources/onap-readme.txt @@ -12,4 +12,7 @@ To know the CLI version, type onap [-v|--version] To know the CLI usage, type onap [-h|--help] To know the usage of sub commands, type onap <command> [-h|--help] -To know more, please refer the Onap wiki https://wiki.onap.org
\ No newline at end of file +To know more, please refer the Onap wiki https://wiki.onap.org + +NOTE: This file has been deprecated in amesterdam release and is +replaced by README.md file
\ No newline at end of file diff --git a/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java b/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java index 517d6c4f..b06824b6 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCommandSampleTest.java @@ -24,7 +24,7 @@ import org.onap.cli.fw.error.OnapCommandException; * This command helps to test the Command functionalities. * */ -@OnapCommandSchema(name = "sample-test", schema = "sample-test-schema.yaml") +@OnapCommandSchema(name = "sample-test", version = "cli-1.0", schema = "sample-test-schema.yaml") public class OnapCommandSampleTest extends OnapCommand { @Override diff --git a/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml b/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml index 6fb12beb..478f58f6 100644 --- a/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml +++ b/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: sample-create description: Sample create into Onap +version: cli-1.0 service: name: sample version: v1 diff --git a/main/src/test/resources/sample-test-schema.yaml b/main/src/test/resources/sample-test-schema.yaml index 419f416c..b1988240 100644 --- a/main/src/test/resources/sample-test-schema.yaml +++ b/main/src/test/resources/sample-test-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: sample-test description: Onap sample command to test the command features +version: cli-1.0 service: name: sample version: v1 |