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>

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 57b7828..b0f1cf3 100644 (file)
--- 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 49919f4..090fae4 100644 (file)
--- 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 7e580b4..eefe727 100644 (file)
--- 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 8f45d88..7dc9d5a 100644 (file)
--- 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);
         }