summaryrefslogtreecommitdiffstats
path: root/framework/src/main
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-08-31 15:33:29 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-08-31 15:48:26 +0530
commite35db04d37e98688c20c6f42fff0c5ce892aa728 (patch)
tree045c183ddccf4bb4ba4237ab5158a2e706347e4b /framework/src/main
parent8de208f3e785f7bf160f4f4413b53bbd91417806 (diff)
Make interactive mode as default
CLI-37 Change-Id: Ic1ea32d4d38a46652de3fe7840391e76bc35a934 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'framework/src/main')
-rw-r--r--framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java48
1 files changed, 34 insertions, 14 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java
index 39f684cc..a58cfd54 100644
--- a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java
+++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java
@@ -238,15 +238,19 @@ public class OnapCommandRegistrar {
String configuredProductVersion = OnapCommandConfg.getEnabledProductVersion();
String errorNote = "";
+ String usageNote = "\n\nTo enable a product version, use one of following methods:"
+ + "\n 1. set env variable CLI_PRODUCT_VERSION"
+ + "\n 2. set cli.product.version in onap.properties"
+ + "\n 3. in interactive mode, use the directive 'use <product version>'\n";
+
if (!this.availableProductVersions.contains(configuredProductVersion)) {
- errorNote = "** CUATION: Please configure the enabled product version to use one of " + this.availableProductVersions.toString() +
- ".\nTo enable a product version, use one of following methods:\n\t 1. set env variable CLI_PRODUCT_VERSION"
- + "\n\t 2. set cli.product.version in onap.properties \n\t 3. in interactive mode, use the directive 'use <product version>'";
+ errorNote = "** CUATION: Please configure the enabled product version to use one of " + this.availableProductVersions.toString() + ".";
+
}
return "CLI version : " + version + "\n"
+ "Available product versions: " + this.availableProductVersions.toString() + "\n"
+ "Enabled product version : " + configuredProductVersion + "\n" +
- errorNote;
+ errorNote + usageNote;
}
/**
@@ -257,6 +261,14 @@ public class OnapCommandRegistrar {
* Help cmd failed
*/
public String getHelp() throws OnapCommandHelpFailed {
+ return this.getHelp(false);
+ }
+
+ public String getHelpForEnabledProductVersion() throws OnapCommandHelpFailed {
+ return this.getHelp(true);
+ }
+
+ private String getHelp(boolean isEnabledProductVersionOnly) throws OnapCommandHelpFailed {
OnapCommandResult help = new OnapCommandResult();
help.setType(ResultType.TABLE);
help.setPrintDirection(PrintDirection.LANDSCAPE);
@@ -268,10 +280,12 @@ public class OnapCommandRegistrar {
help.getRecords().add(attr);
OnapCommandResultAttribute attrVer = new OnapCommandResultAttribute();
- attrVer.setName(Constants.PRODUCT_VERSION.toUpperCase());
- attrVer.setDescription(Constants.DESCRIPTION);
- attrVer.setScope(OnapCommandResultAttributeScope.SHORT);
- help.getRecords().add(attrVer);
+ if (!isEnabledProductVersionOnly) {
+ attrVer.setName(Constants.PRODUCT_VERSION.toUpperCase());
+ attrVer.setDescription(Constants.DESCRIPTION);
+ attrVer.setScope(OnapCommandResultAttributeScope.SHORT);
+ help.getRecords().add(attrVer);
+ }
OnapCommandResultAttribute attrSrv = new OnapCommandResultAttribute();
attrSrv.setName(Constants.SERVICE.toUpperCase());
@@ -285,13 +299,19 @@ public class OnapCommandRegistrar {
attrDesc.setScope(OnapCommandResultAttributeScope.SHORT);
help.getRecords().add(attrDesc);
- for (String cmdName : OnapCommandUtils.sort(this.listCommands())) {
+ for (String cmdName : isEnabledProductVersionOnly ? OnapCommandUtils.sort(this.listCommandsForEnabledProductVersion()) : OnapCommandUtils.sort(this.listCommands())) {
OnapCommand cmd;
try {
- String []cmdVer = cmdName.split(":");
- cmd = this.get(cmdVer[0], cmdVer[1]);
- attr.getValues().add(cmdVer[0]);
- attrVer.getValues().add(cmdVer[1]);
+ if (!isEnabledProductVersionOnly) {
+ String []cmdVer = cmdName.split(":");
+ cmd = this.get(cmdVer[0], cmdVer[1]);
+ attr.getValues().add(cmdVer[0]);
+ attrVer.getValues().add(cmdVer[1]);
+ } else {
+ cmd = this.get(cmdName);
+ attr.getValues().add(cmdName);
+ }
+
attrSrv.getValues().add(cmd.printVersion());
attrDesc.getValues().add(cmd.getDescription());
} catch (OnapCommandException e) {
@@ -300,7 +320,7 @@ public class OnapCommandRegistrar {
}
try {
- return "\n\nOnap sub-commands:\n" + help.print() + "\n" + this.getVersion();
+ return "\n\nOnap sub-commands:\n" + help.print() + (isEnabledProductVersionOnly ? "" : "\n" + this.getVersion());
} catch (OnapCommandException e) {
throw new OnapCommandHelpFailed(e);
}