Migrate msb-url into host-url

CLI framework is being enhanced to support
different service mode like direct and catalog
and msb term is verfy specific to catalog mode.
so its migrated to move to generic format

CLI-29
Change-Id: I93f8354e2f32f7cae1660168ce403c76cca0587f
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

9 files changed, 18 insertions, 18 deletions

diff --git a/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java b/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
index 9cf6bdf5..e50490f4 100644
--- a/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
+++ b/framework/src/test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java
@@ -98,7 +98,7 @@ public class OnapCommandSampleTest {
             d.setValue("true");
             parameters.add(d);
             OnapCommandParameter m = new OnapCommandParameter();
-            m.setName(Constants.DEAFULT_PARAMETER_MSB_URL);
+            m.setName(Constants.DEAFULT_PARAMETER_HOST_URL);
             m.setValue("http://localhost");
             parameters.add(m);
             sample.setParameters(parameters);
@@ -142,7 +142,7 @@ public class OnapCommandSampleTest {
         d.setValue("true");
         parameters.add(d);
         OnapCommandParameter m = new OnapCommandParameter();
-        m.setName(Constants.DEAFULT_PARAMETER_MSB_URL);
+        m.setName(Constants.DEAFULT_PARAMETER_HOST_URL);
         m.setValue("http://localhost");
         parameters.add(m);
         sample.setParameters(parameters);
diff --git a/framework/src/test/java/org/onap/cli/fw/TestCommandValidate.java b/framework/src/test/java/org/onap/cli/fw/TestCommandValidate.java
index b8ac72ef..57847254 100644
--- a/framework/src/test/java/org/onap/cli/fw/TestCommandValidate.java
+++ b/framework/src/test/java/org/onap/cli/fw/TestCommandValidate.java
@@ -42,7 +42,7 @@ public class TestCommandValidate {
 
         OnapCommandParameter noAuthParam = cmd.getParameters().stream().filter(p -> p.getName().equalsIgnoreCase("no-auth")).findFirst().get();
         noAuthParam.setValue(true);
-        OnapCommandParameter msbParam = cmd.getParameters().stream().filter(p -> p.getName().equalsIgnoreCase("msb-url")).findFirst().get();
+        OnapCommandParameter msbParam = cmd.getParameters().stream().filter(p -> p.getName().equalsIgnoreCase("host-url")).findFirst().get();
         msbParam.setValue("localhost://msbip:msb:port");
         cmd.validate();
     }
diff --git a/framework/src/test/java/org/onap/cli/fw/ad/OnapCredentialsTest.java b/framework/src/test/java/org/onap/cli/fw/ad/OnapCredentialsTest.java
index a1987c08..cc431454 100644
--- a/framework/src/test/java/org/onap/cli/fw/ad/OnapCredentialsTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/ad/OnapCredentialsTest.java
@@ -26,7 +26,7 @@ public class OnapCredentialsTest {
     public void credentialsTest() {
         OnapCredentials cre = new OnapCredentials("test", "test123", "url");
         assertTrue(cre.getUsername().equals("test") && cre.getPassword().equals("test123")
-                && cre.getMsbUrl().equals("url"));
+                && cre.getHostUrl().equals("url"));
     }
 
 }
diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java
index e7af1aa3..bfdb14a5 100644
--- a/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java
@@ -39,8 +39,8 @@ public class OnapHttpCommandTest {
         param2.setName("onap-password");
         param2.setParameterType(ParameterType.STRING);
         OnapCommandParameter param3 = new OnapCommandParameter();
-        param3.setLongOption("msb-url");
-        param3.setName("msb-url");
+        param3.setLongOption("host-url");
+        param3.setName("host-url");
         param3.setParameterType(ParameterType.STRING);
         OnapCommandParameter param4 = new OnapCommandParameter();
         param4.setLongOption("string-param");
diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java
index b70bf6f9..89c32c99 100644
--- a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java
@@ -32,7 +32,7 @@ public class OnapSchemaValidateCommandTest {
                 param.setValue("test");
             } else if ("onap-password".equals(param.getName())) {
                 param.setValue("test");
-            } else if ("msb-url".equals(param.getName())) {
+            } else if ("host-url".equals(param.getName())) {
                 param.setValue("test-url");
             } else if ("schema-location".equals(param.getName())) {
                 param.setValue("schema-validate-pass.yaml");
@@ -52,7 +52,7 @@ public class OnapSchemaValidateCommandTest {
                 param.setValue("test");
             } else if ("onap-password".equals(param.getName())) {
                 param.setValue("test");
-            } else if ("msb-url".equals(param.getName())) {
+            } else if ("host-url".equals(param.getName())) {
                 param.setValue("test-url");
             } else if ("schema-location".equals(param.getName())) {
                 param.setValue(
diff --git a/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java b/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java
index 004bf7cf..da37f6f4 100644
--- a/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java
+++ b/framework/src/test/java/org/onap/cli/fw/defaultParameter/TestDefaultParameterSection.java
@@ -43,7 +43,7 @@ public class TestDefaultParameterSection {
         List<String> parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList());
         assertTrue(parameters.contains("onap-username"));
         assertTrue(parameters.contains("onap-password"));
-        assertTrue(parameters.contains("msb-url"));
+        assertTrue(parameters.contains("host-url"));
     }
 
     @Test
@@ -57,7 +57,7 @@ public class TestDefaultParameterSection {
         List<String> parameters = cmd.getParameters().stream().map(p -> p.getName()).collect(Collectors.toList());
         assertTrue(parameters.contains("onap-username"));
         assertTrue(parameters.contains("onap-password"));
-        assertTrue(parameters.contains("msb-url"));
+        assertTrue(parameters.contains("host-url"));
         assertFalse(parameters.contains("long"));
         assertFalse(parameters.contains("format"));
         assertTrue(parameters.contains("debug"));
@@ -75,7 +75,7 @@ public class TestDefaultParameterSection {
 
         assertTrue(parameters.contains("onap-username"));
         assertTrue(parameters.contains("onap-password"));
-        assertTrue(parameters.contains("msb-url"));
+        assertTrue(parameters.contains("host-url"));
     }
 
     @Test
@@ -90,7 +90,7 @@ public class TestDefaultParameterSection {
 
         assertFalse(parameters.contains("onap-username"));
         assertFalse(parameters.contains("onap-password"));
-        assertTrue(parameters.contains("msb-url"));
+        assertTrue(parameters.contains("host-url"));
         assertTrue(parameters.contains("debug"));
         assertTrue(parameters.contains("long"));
         assertTrue(parameters.contains("format"));
diff --git a/framework/src/test/resources/onap.properties b/framework/src/test/resources/onap.properties
index a6c991cd..b2b4fee8 100644
--- a/framework/src/test/resources/onap.properties
+++ b/framework/src/test/resources/onap.properties
@@ -8,7 +8,7 @@ cli.api_gateway=msb
 cli.auth_service=auth
 
 # service section
-cli.exclude_params_internal_cmd=onap-username,onap-password,msb-url,no-auth
-cli.no_auth_disable_include_params_external_cmd=onap-username,onap-password,msb-url,no-auth
+cli.exclude_params_internal_cmd=onap-username,onap-password,host-url,no-auth
+cli.no_auth_disable_include_params_external_cmd=onap-username,onap-password,host-url,no-auth
 cli.no_auth_enable_exclude_params_external_cmd=onap-username,onap-password,no-auth
-cli.no_auth_enable_include_params_external_cmd=msb-url
+cli.no_auth_enable_include_params_external_cmd=host-url
diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt
index d8ce1ef5..074e833e 100644
--- a/framework/src/test/resources/sample-cmd-test-help.txt
+++ b/framework/src/test/resources/sample-cmd-test-help.txt
@@ -5,7 +5,7 @@ Onap sample command to test the command features
 Onap service: sample v1
 
 Options:
-[-u | --onap-username] [-p | --onap-password] [-m | --msb-url]
+[-u | --onap-username] [-p | --onap-password] [-m | --host-url]
 [-h | --help] [-v | --version] [-d | --debug]
 [-f | --format] [-s | --long] [-t | --no-title]
 [-a | --no-auth] [-b | --bool] [-x | --secure]
@@ -19,7 +19,7 @@ where,
 -p | --onap-password   Onap user password. It is of type STRING. By
                         default, it is read from environment variable
                         ONAP_PASSWORD. Secured.
--m | --msb-url          Onap MSB url. It is of type URL. By default, it
+-m | --host-url          Onap MSB url. It is of type URL. By default, it
                         is read from environment variable ONAP_MSB_URL.
 -h | --help             Onap command help message. It is of type STRING.
                         By default, it is false.
diff --git a/framework/src/test/resources/sample-test-include-exclude.yaml b/framework/src/test/resources/sample-test-include-exclude.yaml
index a1494bfe..7a14f262 100644
--- a/framework/src/test/resources/sample-test-include-exclude.yaml
+++ b/framework/src/test/resources/sample-test-include-exclude.yaml
@@ -3,7 +3,7 @@ default_parameters:
   include:
     - onap-username
     - onap-password
-    - msb-url
+    - host-url
     - no-auth
   exclude:
     - long