summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-10-04 23:29:51 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-20 12:24:23 +0530
commit58968a42a77f26f0a465eeccb949ab9f3f63de60 (patch)
treea29b8e751921907928cef7c1e491d6528bcf916c
parentc521118e69aaa589d631f95f34dcf88e7a8bd1b6 (diff)
Migrate OPEN_CLI_PRODUCT_VERSION to IN_USE
Issue-Id: CLI-66 Change-Id: I13f8786b8084b83d04f14dd791862e84bed0101b Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--deployment/docker/src/main/docker/Dockerfile2
-rw-r--r--framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java2
-rw-r--r--framework/src/main/java/org/onap/cli/fw/conf/Constants.java2
-rw-r--r--framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 57b78284..b0f1cf39 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ ENV OPEN_CLI_HOME /opt/onap/cli
ENV OPEN_CLI_DEBUG false
ENV OPEN_CLI_DEBUG_PORT 5005
ENV OPEN_CLI_MODE console
-ENV OPEN_CLI_PRODUCT_VERSION open-cli
+ENV OPEN_CLI_PRODUCT_IN_USE open-cli
ENV HOST_URL http://localhost:8080
ENV OPEN_USERNAME guest
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 49919f43..090fae47 100644
--- a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java
+++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java
@@ -262,7 +262,7 @@ public class OnapCommandRegistrar {
String errorNote = "";
String usageNote = "\n\nTo enable a product version, use one of following methods:"
- + "\n 1. set env variable OPEN_CLI_PRODUCT_VERSION"
+ + "\n 1. set env variable OPEN_CLI_PRODUCT_IN_USE"
+ "\n 2. set cli.product.version in open-cli.properties"
+ "\n 3. in interactive mode, use the directive 'use <product version>'\n";
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 7e580b4a..eefe7273 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
@@ -131,7 +131,7 @@ public class Constants {
public static final String CONF = "open-cli.properties";
public static final String OPEN_IGNORE_AUTH = "cli.ignore_auth";
public static final String OPEN_CLI_VERSION = "cli.version";
- public static final String OPEN_OPEN_CLI_PRODUCT_VERSION_ENV_NAME = "OPEN_CLI_PRODUCT_VERSION";
+ public static final String OPEN_OPEN_CLI_PRODUCT_IN_USE_ENV_NAME = "OPEN_CLI_PRODUCT_IN_USE";
public static final String HTTP_API_KEY_USE_COOKIES = "cli.http.api_key_use_cookies";
public static final String SERVICE_AUTH = "cli.service.auth";
diff --git a/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java b/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java
index 8f45d883..7dc9d5a1 100644
--- a/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java
+++ b/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java
@@ -80,7 +80,7 @@ public final class OnapCommandConfg {
}
public static String getEnabledProductVersion() {
- String version = System.getenv(Constants.OPEN_OPEN_CLI_PRODUCT_VERSION_ENV_NAME);
+ String version = System.getenv(Constants.OPEN_OPEN_CLI_PRODUCT_IN_USE_ENV_NAME);
if (version == null) {
version = prps.getProperty(Constants.OPEN_CLI_PRODUCT_NAME);
}