From 5a0dadc2c7439719142db3c7e2200d12face4b45 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Fri, 11 Aug 2017 10:41:29 +0530 Subject: 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 --- .../test/java/org/onap/cli/cmd/sample/OnapCommandSampleTest.java | 4 ++-- framework/src/test/java/org/onap/cli/fw/TestCommandValidate.java | 2 +- .../src/test/java/org/onap/cli/fw/ad/OnapCredentialsTest.java | 2 +- .../src/test/java/org/onap/cli/fw/cmd/OnapHttpCommandTest.java | 4 ++-- .../java/org/onap/cli/fw/cmd/OnapSchemaValidateCommandTest.java | 4 ++-- .../onap/cli/fw/defaultParameter/TestDefaultParameterSection.java | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'framework/src/test/java') 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 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 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")); -- cgit 1.2.3-korg