aboutsummaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-10-06 23:05:25 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-20 12:41:57 +0530
commitdf2716420918b03320c1ecdfd722cf5a85bac280 (patch)
treebef178b6ddb9942665de518090f02ac56fdf6b0b /framework
parent20dc78d226aca6cb390586a9e19e522d68d0821b (diff)
Normalize all env with OPEN_CLI
Issue-Id: CLI-66 Change-Id: Iac377cf4cbd3e4d7419fcd41417e4c8bc127a03e Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java2
-rw-r--r--framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java4
-rw-r--r--framework/src/main/resources/default_input_parameters_http.yaml6
-rw-r--r--framework/src/test/resources/sample-cmd-test-help.txt2
4 files changed, 7 insertions, 7 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java
index 2f970b5f..f3b949f1 100644
--- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java
+++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java
@@ -19,7 +19,7 @@ package org.onap.cli.fw.error;
import java.util.Set;
/*
- * ONAP command product version is invalid
+ * Open CLI command product version is invalid
*
*/
public class OnapCommandProductVersionInvalid extends OnapCommandException {
diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
index 7baae094..bcb404fe 100644
--- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
@@ -1062,8 +1062,8 @@ public class OnapCommandUtils {
* help failed exception
*/
public static String help(OnapCommand cmd) throws OnapCommandHelpFailed {
- //mrkanag refactor onap name into oclip
- String help = "usage: onap " + cmd.getName();
+
+ String help = "usage: oclip " + cmd.getName();
// Add description
help += "\n\n" + cmd.getDescription();
diff --git a/framework/src/main/resources/default_input_parameters_http.yaml b/framework/src/main/resources/default_input_parameters_http.yaml
index 529053d0..81656ea0 100644
--- a/framework/src/main/resources/default_input_parameters_http.yaml
+++ b/framework/src/main/resources/default_input_parameters_http.yaml
@@ -5,14 +5,14 @@ parameters:
description: Host user name
short_option: u
long_option: host-username
- default_value: $s{env:HOST_USERNAME}
+ default_value: $s{env:OPEN_CLI_HOST_USERNAME}
is_optional: false
- name: host-password
type: string
description: Host user password
short_option: p
long_option: host-password
- default_value: $s{env:HOST_PASSWORD}
+ default_value: $s{env:OPEN_CLI_HOST_PASSWORD}
is_secured: true
is_optional: false
- name: host-url
@@ -21,7 +21,7 @@ parameters:
short_option: m
long_option: host-url
is_optional: false
- default_value: $s{env:HOST_URL}
+ default_value: $s{env:OPEN_CLI_HOST_URL}
- name: no-auth
type: bool
description: whether to authenticate user or not
diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt
index 2523ce9b..fd36587d 100644
--- a/framework/src/test/resources/sample-cmd-test-help.txt
+++ b/framework/src/test/resources/sample-cmd-test-help.txt
@@ -1,4 +1,4 @@
-usage: onap sample-test
+usage: oclip sample-test
Onap sample command to test the command features