From df2716420918b03320c1ecdfd722cf5a85bac280 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Fri, 6 Oct 2017 23:05:25 +0530
Subject: Normalize all env with OPEN_CLI

Issue-Id: CLI-66

Change-Id: Iac377cf4cbd3e4d7419fcd41417e4c8bc127a03e
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 .../org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java     | 2 +-
 framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java | 4 ++--
 framework/src/main/resources/default_input_parameters_http.yaml     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'framework/src/main')

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
-- 
cgit 1.2.3-korg