diff options
Diffstat (limited to 'framework')
46 files changed, 288 insertions, 299 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java index bc9effba..89c62207 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java @@ -47,7 +47,7 @@ import org.onap.cli.fw.output.ResultType; import org.onap.cli.fw.utils.OnapCommandUtils; /** - * Onap Command. + * Oclip Command. * */ public abstract class OnapCommand { @@ -71,7 +71,7 @@ public abstract class OnapCommand { } /** - * Onap command description, defined by derived command. + * Oclip command description, defined by derived command. */ public String getDescription() { return this.cmdDescription; @@ -82,7 +82,7 @@ public abstract class OnapCommand { } /* - * Onap command name like user-create, ns-list, etc , defined by derived command + * Oclip command name like user-create, ns-list, etc , defined by derived command */ public String getName() { return this.cmdName; @@ -105,21 +105,21 @@ public abstract class OnapCommand { } /* - * Onap command input parameters, defined by derived command + * Oclip command input parameters, defined by derived command */ public List<OnapCommandParameter> getParameters() { return this.cmdParameters; } /* - * Onap command input parameters, defined by derived command + * Oclip command input parameters, defined by derived command */ public Map<String, OnapCommandParameter> getParametersMap() { return OnapCommandUtils.getInputMap(this.getParameters()); } /* - * Onap command output results, defined by derived command + * Oclip command output results, defined by derived command */ public OnapCommandResult getResult() { return this.cmdResult; @@ -184,7 +184,7 @@ public abstract class OnapCommand { } /** - * Onap command execute with given parameters on service. Before calling this method, its mandatory to set all + * Oclip command execute with given parameters on service. Before calling this method, its mandatory to set all * parameters value. * * @throws OnapCommandException 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 1a0514ef..dcd9a507 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java @@ -46,7 +46,7 @@ import org.onap.cli.fw.utils.SchemaInfo; /** - * Onap Command registrar provides a common place, where every command would get registered automatically when its + * Oclip Command registrar provides a common place, where every command would get registered automatically when its * loaded into JVM. * */ @@ -258,7 +258,7 @@ public class OnapCommandRegistrar { } /** - * Helps to find the Onap CLI version, could be used with --version or -v option. + * Helps to find the Oclip CLI version, could be used with --version or -v option. * * @return string */ diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommandSchema.java b/framework/src/main/java/org/onap/cli/fw/OnapCommandSchema.java index 47a84955..d7254fb2 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommandSchema.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandSchema.java @@ -24,7 +24,7 @@ import org.onap.cli.fw.cmd.CommandType; /** * Provide command name and schema file location, which is placed in the main resources folder (in classpath). It is - * recommended to keep the name for schema, in the form of onap-[command-name]-schema.yaml, considered this format as + * recommended to keep the name for schema, in the form of oclip-[command-name]-schema.yaml, considered this format as * default if the schema declaration is missing for a command abc-create, schema file name could be * abc-create-schema.yaml, corresponding command would like as below * diff --git a/framework/src/main/java/org/onap/cli/fw/ad/OnapAuthClient.java b/framework/src/main/java/org/onap/cli/fw/ad/OnapAuthClient.java index 362360a3..471b7eaf 100644 --- a/framework/src/main/java/org/onap/cli/fw/ad/OnapAuthClient.java +++ b/framework/src/main/java/org/onap/cli/fw/ad/OnapAuthClient.java @@ -35,7 +35,7 @@ import org.onap.cli.fw.output.OnapCommandResultAttribute; import org.onap.cli.fw.utils.OnapCommandUtils; /** - * Onap Auth client helps to do login and logout. + * Oclip Auth client helps to do login and logout. * */ public class OnapAuthClient { diff --git a/framework/src/main/java/org/onap/cli/fw/ad/OnapService.java b/framework/src/main/java/org/onap/cli/fw/ad/OnapService.java index 7462bb18..a16c4434 100644 --- a/framework/src/main/java/org/onap/cli/fw/ad/OnapService.java +++ b/framework/src/main/java/org/onap/cli/fw/ad/OnapService.java @@ -19,16 +19,16 @@ package org.onap.cli.fw.ad; import org.onap.cli.fw.conf.Constants; /** - * Onap Service as reported in api catalog. + * Oclip Service as reported in api catalog. */ public class OnapService { /* - * Onap Service name like aai. + * Oclip Service name like aai. */ private String serviceName; /* - * Onap Service API version like v1, v2, etc + * Oclip Service API version like v1, v2, etc */ private String serviceVersion; diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/CommandType.java b/framework/src/main/java/org/onap/cli/fw/cmd/CommandType.java index 633a8f35..baaf7e12 100644 --- a/framework/src/main/java/org/onap/cli/fw/cmd/CommandType.java +++ b/framework/src/main/java/org/onap/cli/fw/cmd/CommandType.java @@ -20,7 +20,7 @@ import org.onap.cli.fw.error.OnapCommandInvalidCommandType; import org.onap.cli.fw.error.OnapCommandInvalidParameterType; /** - * Command type supported by Onap CLI. + * Command type supported by Oclip CLI. * */ public enum CommandType { diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java index 860adce6..198affbc 100644 --- a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java +++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java @@ -40,7 +40,7 @@ import org.onap.cli.http.mock.MockRequest; import org.onap.cli.http.mock.MockResponse; /** - * Onap Command. + * Oclip Command. * */ public class OnapHttpCommand extends OnapCommand { @@ -53,7 +53,7 @@ public class OnapHttpCommand extends OnapCommand { protected OnapAuthClient authClient; - private OnapService onapService = new OnapService(); + private OnapService oclipService = new OnapService(); public void setInput(HttpInput input) { this.input = input; @@ -85,14 +85,14 @@ public class OnapHttpCommand extends OnapCommand { } /* - * Onap service, this command uses to execute it. + * Oclip service, this command uses to execute it. */ public OnapService getService() { - return this.onapService; + return this.oclipService; } public void setService(OnapService service) { - this.onapService = service; + this.oclipService = service; } @Override 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 60929358..bc01a769 100644 --- a/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java +++ b/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConfg.java @@ -27,7 +27,7 @@ import java.util.UUID; import java.util.stream.Collectors; /** - * Onap command constants. + * Oclip command constants. * */ public final class OnapCommandConfg { diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationFailed.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationFailed.java index a353c4c6..fa826d5d 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationFailed.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationFailed.java @@ -17,7 +17,7 @@ package org.onap.cli.fw.error; /** - * Command Not registered in Onap Command Registrar. + * Command Not registered in Oclip Command Registrar. * */ public class OnapCommandRegistrationFailed extends OnapCommandException { diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationProductInfoMissing.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationProductInfoMissing.java index 7584feca..c3d9e624 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationProductInfoMissing.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandRegistrationProductInfoMissing.java @@ -17,7 +17,7 @@ package org.onap.cli.fw.error; /** - * Command Not registered in Onap Command Registrar as version missing. + * Command Not registered in Oclip Command Registrar as version missing. * */ public class OnapCommandRegistrationProductInfoMissing extends OnapCommandException { diff --git a/framework/src/main/java/org/onap/cli/fw/info/OnapCommandInfo.java b/framework/src/main/java/org/onap/cli/fw/info/OnapCommandInfo.java index b127ad35..f3f3bfe1 100644 --- a/framework/src/main/java/org/onap/cli/fw/info/OnapCommandInfo.java +++ b/framework/src/main/java/org/onap/cli/fw/info/OnapCommandInfo.java @@ -19,7 +19,7 @@ package org.onap.cli.fw.info; import org.onap.cli.fw.cmd.CommandType; /** - * Onap Command info like product version, service, contact, etc. + * Oclip Command info like product version, service, contact, etc. */ public class OnapCommandInfo { diff --git a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java index 09071f11..05b5fa29 100644 --- a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java +++ b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.UUID; /** - * Onap Command's input parameter. + * Oclip Command's input parameter. * */ public class OnapCommandParameter { diff --git a/framework/src/main/java/org/onap/cli/fw/input/ParameterType.java b/framework/src/main/java/org/onap/cli/fw/input/ParameterType.java index 791d7e42..6a9254f5 100644 --- a/framework/src/main/java/org/onap/cli/fw/input/ParameterType.java +++ b/framework/src/main/java/org/onap/cli/fw/input/ParameterType.java @@ -19,7 +19,7 @@ package org.onap.cli.fw.input; import org.onap.cli.fw.error.OnapCommandInvalidParameterType; /** - * Parameter type supported by Onap CLI. + * Parameter type supported by Oclip CLI. * */ public enum ParameterType { diff --git a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java index 5dd761c6..678bcfc9 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java +++ b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; /** - * Onap Command result holds the final output of the command. + * Oclip Command result holds the final output of the command. * */ public class OnapCommandResult { /* - * if type=JSON, then JSON response of the command from back-end Onap service, by default all the command would + * if type=JSON, then JSON response of the command from back-end Oclip service, by default all the command would * set this value once the back-end call returns, which would be useful to print the output in JSON format, returned * from the back-end service. * diff --git a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java index fcd6f1a2..ba4d5433 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java +++ b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttribute.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; /** - * Onap command output records, helps to define the title and its description while command is defined and during run + * Oclip command output records, helps to define the title and its description while command is defined and during run * time, it captures the value of the output as well. */ public class OnapCommandResultAttribute { diff --git a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttributeScope.java b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttributeScope.java index e03937d3..0f63f233 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttributeScope.java +++ b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResultAttributeScope.java @@ -19,7 +19,7 @@ package org.onap.cli.fw.output; import org.onap.cli.fw.error.OnapCommandInvalidResultAttributeScope; /** - * Onap command supports to print output with given set of defined attributes, and each attributes are marked with this + * Oclip command supports to print output with given set of defined attributes, and each attributes are marked with this * visibility. * */ diff --git a/framework/src/main/java/org/onap/cli/fw/output/ResultType.java b/framework/src/main/java/org/onap/cli/fw/output/ResultType.java index 37449447..49ddf457 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/ResultType.java +++ b/framework/src/main/java/org/onap/cli/fw/output/ResultType.java @@ -17,7 +17,7 @@ package org.onap.cli.fw.output; /** - * Onap command result format. + * Oclip command result format. * */ public enum ResultType { diff --git a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java index 8b7a9b83..beb2330f 100644 --- a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java +++ b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.StringTokenizer; /** - * Onap Command Table print. + * Oclip Command Table print. * */ public class OnapCommandPrint { diff --git a/framework/src/main/java/org/onap/cli/fw/run/OnapCommandExecutor.java b/framework/src/main/java/org/onap/cli/fw/run/OnapCommandExecutor.java index abd04b02..a3ff7bc8 100644 --- a/framework/src/main/java/org/onap/cli/fw/run/OnapCommandExecutor.java +++ b/framework/src/main/java/org/onap/cli/fw/run/OnapCommandExecutor.java @@ -17,7 +17,7 @@ package org.onap.cli.fw.run; /** - * Onap Command executor. + * Oclip Command executor. * */ public class OnapCommandExecutor { 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 bcb404fe..579c4af4 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 @@ -1204,7 +1204,7 @@ public class OnapCommandUtils { } /** - * Discover the Onap commands. + * Discover the Oclip commands. * * @return list */ diff --git a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml index 136bc1cd..349554b0 100644 --- a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml +++ b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: schema-refresh -description: Onap command to refresh schemas stored in open_cli_schema folders. +description: Oclip command to refresh schemas stored in open_cli_schema folders. info: product: open-cli diff --git a/framework/src/main/resources/open-cli-schema/schema-validate.yaml b/framework/src/main/resources/open-cli-schema/schema-validate.yaml index e5b22bbf..65acfb0e 100644 --- a/framework/src/main/resources/open-cli-schema/schema-validate.yaml +++ b/framework/src/main/resources/open-cli-schema/schema-validate.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: schema-validate -description: Onap command to validate schema +description: Oclip command to validate schema info: product: open-cli diff --git a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java index 03744345..8a69ae61 100644 --- a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java +++ b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java @@ -75,7 +75,7 @@ public class OnapCommandRegistrarTest { } @Test - public void onapCommandNotFoundTest() throws OnapCommandException { + public void oclipCommandNotFoundTest() throws OnapCommandException { try { registerar = OnapCommandRegistrar.getRegistrar(); registerar.get("Test1"); @@ -88,7 +88,7 @@ public class OnapCommandRegistrarTest { } @Test - public void onapCommandRegistrationFailedTest() throws OnapCommandException { + public void oclipCommandRegistrationFailedTest() throws OnapCommandException { @OnapCommandSchema(schema = "sample-test-schema.yaml") class Test extends OnapCommand { diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaRefreshCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaRefreshCommandTest.java index b9345f77..7aedd42d 100644 --- a/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaRefreshCommandTest.java +++ b/framework/src/test/java/org/onap/cli/fw/cmd/OnapSchemaRefreshCommandTest.java @@ -32,14 +32,14 @@ public class OnapSchemaRefreshCommandTest { cmd.initializeSchema("schema-refresh.yaml"); cmd.execute(); - List<OnapCommandResultAttribute> onapCommandResultAttribute = cmd.getResult() + List<OnapCommandResultAttribute> oclipCommandResultAttribute = cmd.getResult() .getRecords(); - String s1Number = onapCommandResultAttribute.get(0).getValues().get(0); - String cmdName = onapCommandResultAttribute.get(1).getValues().get(0); - String cmdVer = onapCommandResultAttribute.get(2).getValues().get(0); - String cmdFile = onapCommandResultAttribute.get(3).getValues().get(0); - String version = onapCommandResultAttribute.get(4).getValues().get(0); + String s1Number = oclipCommandResultAttribute.get(0).getValues().get(0); + String cmdName = oclipCommandResultAttribute.get(1).getValues().get(0); + String cmdVer = oclipCommandResultAttribute.get(2).getValues().get(0); + String cmdFile = oclipCommandResultAttribute.get(3).getValues().get(0); + String version = oclipCommandResultAttribute.get(4).getValues().get(0); assertTrue(s1Number.equalsIgnoreCase("1")); } diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java index f23fb0b1..45560c4a 100644 --- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java +++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class OnapCommandErrorTest { @Test - public void onapCommandDiscoveryFailedTest() { + public void oclipCommandDiscoveryFailedTest() { OnapCommandDiscoveryFailed failed = new OnapCommandDiscoveryFailed("name"); assertEquals("0x1001::Failed auto discover schema files from name under class path, ", failed.getMessage()); failed = new OnapCommandDiscoveryFailed("directory", "name"); @@ -32,45 +32,45 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandInvalidParameterValueTest() { + public void oclipCommandInvalidParameterValueTest() { OnapCommandInvalidParameterValue failed = new OnapCommandInvalidParameterValue("name"); assertEquals("0x7002::Parameter name value is invalid, ", failed.getMessage()); } @Test - public void onapCommandResultMapProcessingFailedTest() { + public void oclipCommandResultMapProcessingFailedTest() { OnapCommandResultMapProcessingFailed failed = new OnapCommandResultMapProcessingFailed("name", new Exception("failed")); assertEquals("0x3002::Failed to parse the result format of command name, failed", failed.getMessage()); } @Test - public void onapCommandHttpHeaderNotFoundTest() { + public void oclipCommandHttpHeaderNotFoundTest() { OnapCommandHttpHeaderNotFound failed = new OnapCommandHttpHeaderNotFound("name"); assertEquals("0x3003::Http header name is not returned from the service", failed.getMessage()); } @Test - public void onapCommandClientInitialzationFailedTest() { + public void oclipCommandClientInitialzationFailedTest() { OnapCommandClientInitialzationFailed failed = new OnapCommandClientInitialzationFailed("Test", new Exception("Test Command Failed")); assertEquals("0x5001::API client for the command Test is failed, Test Command Failed", failed.getMessage()); } @Test - public void onapCommandExceptionTest1() { + public void oclipCommandExceptionTest1() { OnapCommandException failed = new OnapCommandException("1", "Test Command Failed"); assertEquals("1::Test Command Failed", failed.getMessage()); } @Test - public void onapCommandExceptionTest2() { + public void oclipCommandExceptionTest2() { OnapCommandException failed = new OnapCommandException("1", "Test Command Failed", 201); assertEquals("201::1::Test Command Failed", failed.getMessage()); } @Test - public void onapCommandExecutionFailedTest1() { + public void oclipCommandExecutionFailedTest1() { OnapCommandExecutionFailed failed = new OnapCommandExecutionFailed("Test", "Test Command Failed", 201); assertEquals("201::0x6001::Command Test failed to execute, Test Command Failed", failed.getMessage()); failed = new OnapCommandExecutionFailed("Test", new Exception("Test Command Failed"), 201); @@ -78,13 +78,13 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandExecutionFailedTest2() { + public void oclipCommandExecutionFailedTest2() { OnapCommandExecutionFailed failed = new OnapCommandExecutionFailed("Test Command Failed"); assertEquals("0x6001::Test Command Failed", failed.getMessage()); } @Test - public void onapCommandExecutionFailedTest3() { + public void oclipCommandExecutionFailedTest3() { OnapCommandExecutionFailed failed = new OnapCommandExecutionFailed("Test", "Test Command Failed"); assertEquals("0x6001::Command Test failed to execute, Test Command Failed", failed.getMessage()); @@ -93,21 +93,21 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandExecutorInfoMissingTest() { + public void oclipCommandExecutorInfoMissingTest() { OnapCommandExecutorInfoMissing failed = new OnapCommandExecutorInfoMissing("Test"); assertEquals("0x6002::Command Test excutor info is missing from schema", failed.getMessage()); } @Test - public void onapCommandHelpFailedTest() { + public void oclipCommandHelpFailedTest() { OnapCommandHelpFailed failed = new OnapCommandHelpFailed(new Exception("Failed")); assertEquals("0x9001::Command failed to print help message, Failed", failed.getMessage()); } @Test - public void onapCommandHttpFailureTest1() { + public void oclipCommandHttpFailureTest1() { OnapCommandHttpFailure failed = new OnapCommandHttpFailure("Failed"); assertEquals("0x3001::Failed", failed.getMessage()); @@ -116,28 +116,28 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandHttpFailureTest2() { + public void oclipCommandHttpFailureTest2() { OnapCommandHttpFailure failed = new OnapCommandHttpFailure("Failed", 203); assertEquals("203::0x3001::Failed", failed.getMessage()); } @Test - public void onapCommandInvalidParameterTypeTest() { + public void oclipCommandInvalidParameterTypeTest() { OnapCommandInvalidParameterType failed = new OnapCommandInvalidParameterType("Failed"); assertEquals("0x7001::Parameter type Failed is invalid", failed.getMessage()); } @Test - public void onapCommandInvalidPrintDirectionTest() { + public void oclipCommandInvalidPrintDirectionTest() { OnapCommandInvalidPrintDirection failed = new OnapCommandInvalidPrintDirection("Direction"); assertEquals("0x8003::Print direction Direction is invalid", failed.getMessage()); } @Test - public void onapCommandInvalidRegistrationTest() { + public void oclipCommandInvalidRegistrationTest() { OnapCommandInvalidRegistration failed = new OnapCommandInvalidRegistration(OnapCommandErrorTest.class); assertEquals("0x2001::Invalid commad class org.onap.cli.fw.error.OnapCommandErrorTest registration, " @@ -145,42 +145,42 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandInvalidResultAttributeScopeTest() { + public void oclipCommandInvalidResultAttributeScopeTest() { OnapCommandInvalidResultAttributeScope failed = new OnapCommandInvalidResultAttributeScope("Attribute"); assertEquals("0x8002::Result atrribute Attribute is invalid", failed.getMessage()); } @Test - public void onapCommandInvalidSchemaTest() { + public void oclipCommandInvalidSchemaTest() { OnapCommandInvalidSchema failed = new OnapCommandInvalidSchema("Schema", "Failed"); assertEquals("0xb001::Invalid command schema Schema, Failed", failed.getMessage()); } @Test - public void onapCommandInvalidSchemaVersionTest() { + public void oclipCommandInvalidSchemaVersionTest() { OnapCommandInvalidSchemaVersion failed = new OnapCommandInvalidSchemaVersion("1.0"); assertEquals("0xb003::Command schema open_cli_schema_version 1.0 is invalid or missing", failed.getMessage()); } @Test - public void onapCommandLoginFailedTest1() { + public void oclipCommandLoginFailedTest1() { OnapCommandLoginFailed failed = new OnapCommandLoginFailed(new Exception("Failed")); assertEquals("0x4001::Login failed, Failed", failed.getMessage()); } @Test - public void onapCommandLoginFailedTest2() { + public void oclipCommandLoginFailedTest2() { OnapCommandLoginFailed failed = new OnapCommandLoginFailed("Failed", 201); assertEquals("201::0x4001::Login failed, Failed", failed.getMessage()); } @Test - public void onapCommandLogoutFailedTest() { + public void oclipCommandLogoutFailedTest() { OnapCommandLogoutFailed failed = new OnapCommandLogoutFailed(new Exception("Failed")); assertEquals("0x4002::Logout failed, Failed", failed.getMessage()); @@ -189,42 +189,42 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandNotFoundTest() { + public void oclipCommandNotFoundTest() { OnapCommandNotFound failed = new OnapCommandNotFound("Test", "1.0"); assertEquals("0x6003::Command Test is not available for product version 1.0", failed.getMessage()); } @Test - public void onapCommandNotInitializedTest() { + public void oclipCommandNotInitializedTest() { OnapCommandNotInitialized failed = new OnapCommandNotInitialized("Test"); assertEquals("0x6004::Command Test is not initialized", failed.getMessage()); } @Test - public void onapCommandOutputPrintingFailedTest() { + public void oclipCommandOutputPrintingFailedTest() { OnapCommandOutputPrintingFailed failed = new OnapCommandOutputPrintingFailed(new Exception("error")); assertEquals("0x8006::Command is failed to print the result, error", failed.getMessage()); } @Test - public void onapCommandParameterMissingTest() { + public void oclipCommandParameterMissingTest() { OnapCommandParameterMissing failed = new OnapCommandParameterMissing("paramName"); assertEquals("0x7003::Parameter paramName is mandatory", failed.getMessage()); } @Test - public void onapCommandParameterNameConflictTest() { + public void oclipCommandParameterNameConflictTest() { OnapCommandParameterNameConflict failed = new OnapCommandParameterNameConflict("paramName"); assertEquals("0x7004::Parameter name paramName is in conflict", failed.getMessage()); } @Test - public void onapCommandParameterOptionConflictTest() { + public void oclipCommandParameterOptionConflictTest() { OnapCommandParameterOptionConflict failed = new OnapCommandParameterOptionConflict("option"); assertEquals("0x7006::Parameter option option is in conflict, only one option is allowed with given name", @@ -232,14 +232,14 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandRegistrationFailedTest() { + public void oclipCommandRegistrationFailedTest() { OnapCommandRegistrationFailed failed = new OnapCommandRegistrationFailed("Test", "error"); assertEquals("0x2002::Failed to register the command Test, error", failed.getMessage()); } @Test - public void onapCommandResultInitialzationFailedTest() { + public void oclipCommandResultInitialzationFailedTest() { OnapCommandResultInitialzationFailed failed = new OnapCommandResultInitialzationFailed("Test", new Exception("error")); @@ -247,32 +247,21 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandSchemaNotFoundTest() { + public void oclipCommandSchemaNotFoundTest() { OnapCommandSchemaNotFound failed = new OnapCommandSchemaNotFound("Test"); assertEquals("0xb002::Command schema is missing for command Test", failed.getMessage()); } @Test - public void onapCommandSampleInvalidTest() { - OnapCommandInvalidSample failed = new OnapCommandInvalidSample("Test", "error"); - - assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage()); - - failed = new OnapCommandInvalidSample("Test", new Exception("error")); - - assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage()); - } - - @Test - public void onapCommandServiceNotFoundTest() { + public void oclipCommandServiceNotFoundTest() { OnapCommandServiceNotFound failed = new OnapCommandServiceNotFound("Service"); assertEquals("0xd001::Service Service is not found in MSB", failed.getMessage()); } @Test - public void onapCommandOutputFormatNotsupportedTest() { + public void oclipCommandOutputFormatNotsupportedTest() { OnapCommandOutputFormatNotsupported failed = new OnapCommandOutputFormatNotsupported("Format"); assertEquals("0x8005::Command does not support the output format Format", failed.getMessage()); @@ -280,7 +269,7 @@ public class OnapCommandErrorTest { @Test - public void onapProfilePersistTest() { + public void oclipProfilePersistTest() { OnapCommandPersistProfileFailed failed = new OnapCommandPersistProfileFailed("error"); assertEquals("0xc002::Failed to persist profile details, error", failed.getMessage()); @@ -292,7 +281,7 @@ public class OnapCommandErrorTest { @Test - public void onapProfileLoadTest() { + public void oclipProfileLoadTest() { OnapCommandLoadProfileFailed failed = new OnapCommandLoadProfileFailed("error"); assertEquals("0xc001::Failed to load profile details, error", failed.getMessage()); @@ -303,7 +292,7 @@ public class OnapCommandErrorTest { } @Test - public void onapCommandTypeInvalidTest() { + public void oclipCommandTypeInvalidTest() { OnapCommandInvalidCommandType failed = new OnapCommandInvalidCommandType("test"); assertEquals("0x3003::Command type test is invalid", failed.getMessage()); diff --git a/framework/src/test/java/org/onap/cli/fw/input/OnapCommandParameterTest.java b/framework/src/test/java/org/onap/cli/fw/input/OnapCommandParameterTest.java index 6137b9dc..f2e9f0b3 100644 --- a/framework/src/test/java/org/onap/cli/fw/input/OnapCommandParameterTest.java +++ b/framework/src/test/java/org/onap/cli/fw/input/OnapCommandParameterTest.java @@ -91,7 +91,7 @@ public class OnapCommandParameterTest { } @Test(expected = OnapCommandInvalidParameterValue.class) - public void onapCommandInvalidParameterValueArrayExeceptionTest() throws OnapCommandInvalidParameterValue { + public void oclipCommandInvalidParameterValueArrayExeceptionTest() throws OnapCommandInvalidParameterValue { OnapCommandParameter param = new OnapCommandParameter(); param.setName("name"); param.setParameterType(ParameterType.ARRAY); @@ -101,7 +101,7 @@ public class OnapCommandParameterTest { } @Test(expected = OnapCommandInvalidParameterValue.class) - public void onapCommandInvalidParameterValueMapExeceptionTest() throws OnapCommandInvalidParameterValue { + public void oclipCommandInvalidParameterValueMapExeceptionTest() throws OnapCommandInvalidParameterValue { OnapCommandParameter param = new OnapCommandParameter(); param.setName("name"); param.setParameterType(ParameterType.MAP); @@ -110,7 +110,7 @@ public class OnapCommandParameterTest { } @Test(expected = OnapCommandInvalidParameterValue.class) - public void onapCommandInvalidParameterValueBinaryExeceptionTest() throws OnapCommandException { + public void oclipCommandInvalidParameterValueBinaryExeceptionTest() throws OnapCommandException { OnapCommandParameter param = new OnapCommandParameter(); param.setName("name"); param.setParameterType(ParameterType.BINARY); diff --git a/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultAttributeScopeTest.java b/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultAttributeScopeTest.java index d74f83a3..76d139a0 100644 --- a/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultAttributeScopeTest.java +++ b/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultAttributeScopeTest.java @@ -25,7 +25,7 @@ import java.util.Collections; public class OnapCommandResultAttributeScopeTest { @Test - public void onapCommandResultAttributeTest() { + public void oclipCommandResultAttributeTest() { OnapCommandResultAttribute att = new OnapCommandResultAttribute(); att.setDescription("description"); att.setName("name"); diff --git a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java index 62a61d86..654b20cd 100644 --- a/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java +++ b/framework/src/test/java/org/onap/cli/fw/schema/ValidateSchemaTest.java @@ -117,8 +117,8 @@ public class ValidateSchemaTest { }; List<String> errorList4 = OnapCommandUtils.loadSchema(cmd2, "schema-validate-invalid.yaml", true, true); - OnapHttpCommand onapHttpCommand = new OnapHttpCommand(); - errorList4.addAll(OnapCommandUtils.loadHttpSchema(onapHttpCommand, + OnapHttpCommand oclipHttpCommand = new OnapHttpCommand(); + errorList4.addAll(OnapCommandUtils.loadHttpSchema(oclipHttpCommand, "schema-validate-invalid.yaml", true, true)); assertTrue(errorList4.size() > 0); diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java index db94a555..43883ce6 100644 --- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java +++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java @@ -69,12 +69,12 @@ import mockit.MockUp; public class OnapCommandUtilsTest { @Test(expected = OnapCommandInvalidSchema.class) - public void onapCommandUtilsInputStreamNullTest() throws OnapCommandException { + public void oclipCommandUtilsInputStreamNullTest() throws OnapCommandException { OnapCommandUtils.validateSchemaVersion("sample-test1-schema-http1.yaml", "1.0"); } @Test - public void onapCommandUtilsInputStreamNotNullTest() throws OnapCommandException { + public void oclipCommandUtilsInputStreamNotNullTest() throws OnapCommandException { Map<String, ?> map = OnapCommandUtils.validateSchemaVersion("sample-test1-schema-http.yaml", "1.0"); assertTrue(map != null); } diff --git a/framework/src/test/resources/onap-test-schema.yaml b/framework/src/test/resources/onap-test-schema.yaml index 9f1bf0e2..496cb023 100644 --- a/framework/src/test/resources/onap-test-schema.yaml +++ b/framework/src/test/resources/onap-test-schema.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli @@ -11,14 +11,14 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -26,59 +26,59 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string is_secured: true - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short is_secured: false type: string
\ No newline at end of file diff --git a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml index e3b415b1..347e9123 100644 --- a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml +++ b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli service: test @@ -9,7 +9,7 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true @@ -17,7 +17,7 @@ parameters: is_include: true - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -25,61 +25,61 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: true default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: true - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: true is_secured: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: true default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: true default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: true default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: true default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string is_secured: true default_value: req-$s{uuid} - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short is_secured: false type: string diff --git a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml index b96a498b..72c7dc55 100644 --- a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml +++ b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test1 -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli @@ -11,14 +11,14 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -26,47 +26,47 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt http: diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt index fd36587d..bc1305cb 100644 --- a/framework/src/test/resources/sample-cmd-test-help.txt +++ b/framework/src/test/resources/sample-cmd-test-help.txt @@ -1,8 +1,8 @@ usage: oclip sample-test -Onap sample command to test the command features +Oclip sample command to test the command features -Onap service: sample v1 +Oclip service: sample v1 Options: [-h | --help] [-v | --version] [-d | --debug] @@ -12,9 +12,9 @@ Options: [-l | --long-opt] [-r | --url] [-z | --env] <positional-args> where, --h | --help Onap command help message. It is of type STRING. +-h | --help Oclip command help message. It is of type STRING. By default, it is false. --v | --version Onap command service version. It is of type +-v | --version Oclip command service version. It is of type STRING. By default, it is false. -d | --debug Enable debug output. It is of type BOOL. By default, it is false. @@ -26,34 +26,34 @@ where, false. -t | --no-title whether to print title or not. It is of type BOOL. By default, it is false. --b | --bool Onap boolean param, by default its always false. +-b | --bool Oclip boolean param, by default its always false. It is of type BOOL. It is optional. By default, it is false. --x | --secure Onap secure param such as password. It is of +-x | --secure Oclip secure param such as password. It is of type STRING. Secured. --c | --string-param Onap string param. It is of type STRING. --y | --yaml-param Onap yaml file location param. It is of type +-c | --string-param Oclip string param. It is of type STRING. +-y | --yaml-param Oclip yaml file location param. It is of type JSON. It's recommended to input the complete path of the file, which is having the value for it. --j | --json-param Onap json file location param. It is of type +-j | --json-param Oclip json file location param. It is of type JSON. It's recommended to input the complete path of the file, which is having the value for it. --l | --long-opt Onap long param. It is of type LONG. By default, +-l | --long-opt Oclip long param. It is of type LONG. By default, it is 10. --r | --url Onap url param. It is of type URL. By default, +-r | --url Oclip url param. It is of type URL. By default, it is http://localhost:8082/file.txt. --z | --env Onap env param. It is of type STRING. By +-z | --env Oclip env param. It is of type STRING. By default, it is read from environment variable ENV_VAR. -positional-args Onap positional args, if no short option and no +positional-args Oclip positional args, if no short option and no long option given for it. It is of type STRING. By default, it is http://localhost:8082/file.txt. Results: -output-1 Onap output attribute marked in short and is of +output-1 Oclip output attribute marked in short and is of type STRING. It is secured. -output-2 Onap output attribute marked in long and is of +output-2 Oclip output attribute marked in long and is of type STRING. diff --git a/framework/src/test/resources/sample-test-info.yaml b/framework/src/test/resources/sample-test-info.yaml index 58e7268d..b80bfad7 100644 --- a/framework/src/test/resources/sample-test-info.yaml +++ b/framework/src/test/resources/sample-test-info.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test-info -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml index bf2ce3f3..a0fb0d56 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli @@ -11,14 +11,14 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -26,57 +26,57 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: secure short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short type: string
\ No newline at end of file diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml index 239c5360..0718f315 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli service: test @@ -10,21 +10,21 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -32,57 +32,57 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short type: string
\ No newline at end of file diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml index 4c6b27e4..d61bf6e9 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli service: test @@ -9,14 +9,14 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x short_option: y long_option: secure @@ -25,57 +25,57 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short type: string
\ No newline at end of file diff --git a/framework/src/test/resources/sample-test-invalid-schema.yaml b/framework/src/test/resources/sample-test-invalid-schema.yaml index 05da6ce7..06c45daa 100644 --- a/framework/src/test/resources/sample-test-invalid-schema.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli service: test @@ -9,14 +9,14 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true default_value: false - name: secure-param type: string - description: Onap secure param such as password + description: Oclip secure param such as password short_option: x long_option: secure is_secured: true @@ -24,57 +24,57 @@ parameters: default_Value: pass123# - name: string-param type: string - description: Onap string param + description: Oclip string param long_option: string-param short_option: c is_optional: false default_Value: test - name: yaml-param type: json - description: Onap yaml file location param + description: Oclip yaml file location param long_option: yaml-param short_option: y is_optional: false - name: json-param type: json - description: Onap json file location param + description: Oclip json file location param long_option: json-param short_option: j is_optional: false - name: long-param type: digit - description: Onap long param + description: Oclip long param short_option: l long_option: long-opt is_optional: false default_value: 10 - name: url-param type: url - description: Onap url param + description: Oclip url param short_option: r long_option: url is_optional: false default_value: http://localhost:8082/file.txt - name: env-param type: string - description: Onap env param. + description: Oclip env param. short_option: z long_option: env is_optional: false default_value: ${ENV_VAR} - name: positional-args type: string - description: Onap positional args, if no short option and no long option given for it + description: Oclip positional args, if no short option and no long option given for it is_optional: false default_value: http://localhost:8082/file.txt results: direction: portrait attributes: - name: output-1 - description: Onap output attribute marked in short + description: Oclip output attribute marked in short scope: short type: string - name: output-2 - description: Onap output attribute marked in long + description: Oclip output attribute marked in long scope: short type: string
\ No newline at end of file diff --git a/framework/src/test/resources/sample-test-schema-auth-required.yaml b/framework/src/test/resources/sample-test-schema-auth-required.yaml index e7f5419a..062388f1 100644 --- a/framework/src/test/resources/sample-test-schema-auth-required.yaml +++ b/framework/src/test/resources/sample-test-schema-auth-required.yaml @@ -1,6 +1,6 @@ open_cli_schema_version: 1.0 name: sample-test -description: Onap sample command to test the command features +description: Oclip sample command to test the command features info: product: open-cli service: test @@ -9,7 +9,7 @@ info: parameters: - name: bool-param type: bool - description: Onap boolean param, by default its always false. + description: Oclip boolean param, by default its always false. short_option: b long_option: bool is_optional: true diff --git a/framework/src/test/resources/sample-test-schema-http.yaml b/framework/src/test/resources/sample-test-schema-http.yaml index 60b45e80..b5d91604 100644 --- a/framework/src/test/resources/sample-test-schema-http.yaml +++ b/framework/src/test/resources/sample-test-schema-http.yaml @@ -8,65 +8,65 @@ info: author: Kanagaraj Manickam mkr1481@gmail.com parameters: - name: service-name - description: Onap service name + description: Oclip service name type: string short_option: x long_option: service-name is_optional: false - name: service-version - description: Onap service version + description: Oclip service version type: string short_option: y long_option: service-version is_optional: false - name: service-url - description: Onap service base url + description: Oclip service base url type: url short_option: r long_option: service-url is_optional: false - name: status - description: Onap service status + description: Oclip service status type: digit short_option: z long_option: service-status is_optional: true default_value: 1 - name: node-ip - description: Onap service running node IP + description: Oclip service running node IP type: string - name: node-port - description: Onap service running node port + description: Oclip service running node port type: string - name: create-or-update - description: Onap service create or update + description: Oclip service create or update type: bool default_value: true results: direction: portrait attributes: - name: name - description: Onap service name + description: Oclip service name scope: short type: string - name: version - description: Onap service version + description: Oclip service version scope: short type: string - name: url - description: Onap service base url + description: Oclip service base url scope: short type: url - name: status - description: Onap service status + description: Oclip service status scope: short type: digit - name: nodes - description: Onap service running nodes + description: Oclip service running nodes scope: long type: string - name: location - description: Onap service location + description: Oclip service location scope: long type: url http: diff --git a/framework/src/test/resources/sample-test-schema-swagger.yaml b/framework/src/test/resources/sample-test-schema-swagger.yaml index 0c52c71c..2d8086e5 100644 --- a/framework/src/test/resources/sample-test-schema-swagger.yaml +++ b/framework/src/test/resources/sample-test-schema-swagger.yaml @@ -9,7 +9,7 @@ info: parameters: - name: user type: string - description: Onap user + description: Oclip user short_option: n long_option: username is_optional: false @@ -17,7 +17,7 @@ results: direction: portrait attributes: - name: name - description: Onap user + description: Oclip user scope: short type: string exec: diff --git a/framework/src/test/resources/schema-validate-basic.yaml b/framework/src/test/resources/schema-validate-basic.yaml index a4219049..14104879 100644 --- a/framework/src/test/resources/schema-validate-basic.yaml +++ b/framework/src/test/resources/schema-validate-basic.yaml @@ -8,64 +8,64 @@ info: author: Kanagaraj Manickam mkr1481@gmail.com parameters: - name: service-name1 - description: Onap service name + description: Oclip service name type: string short_option: x long_option: service-name is_optional: false - name: service-version - description: Onap service version + description: Oclip service version type: string short_option: x long_option: service-version is_optional: false - name: service-url - description: Onap service base url + description: Oclip service base url type: url1 short_option: u long_option: service-url is_optional: false1 - name: status - description: Onap service status + description: Oclip service status type: digit short_option: z long_option: service-version is_optional: true default_value: 1 - name: node-ip - description: Onap service running node IP + description: Oclip service running node IP type: string - name: node-port - description: Onap service running node port + description: Oclip service running node port type: string - name: create-or-update - description: Onap service create or update + description: Oclip service create or update type: cfbcv default_value: true results: direction: portrait1 attributes: - name: name - description: Onap service name + description: Oclip service name scope: short type: string - name: version - description: Onap service version + description: Oclip service version scope: short type: string - name: status - description: Onap service base url + description: Oclip service base url scope: short type: url - name: status - description: Onap service status + description: Oclip service status scope: short1 type: digit - name: nodes - description: Onap service running nodes + description: Oclip service running nodes scope: long type: string - name: location - description: Onap service location + description: Oclip service location scope: long type: url
\ No newline at end of file diff --git a/framework/src/test/resources/schema-validate-http.yaml b/framework/src/test/resources/schema-validate-http.yaml index 544de82b..8228b179 100644 --- a/framework/src/test/resources/schema-validate-http.yaml +++ b/framework/src/test/resources/schema-validate-http.yaml @@ -9,65 +9,65 @@ info: parameters: - name: service-name1 - description: Onap service name + description: Oclip service name type: string short_option: x long_option: service-name is_optional: false - name: service-version - description: Onap service version + description: Oclip service version type: string short_option: x long_option: service-version is_optional: false - name: service-url - description: Onap service base url + description: Oclip service base url type: url1 short_option: u long_option: service-url is_optional: false1 - name: status - description: Onap service status + description: Oclip service status type: digit short_option: z long_option: service-version is_optional: true default_value: 1 - name: node-ip - description: Onap service running node IP + description: Oclip service running node IP type: string - name: node-port - description: Onap service running node port + description: Oclip service running node port type: string - name: create-or-update - description: Onap service create or update + description: Oclip service create or update type: cfbcv default_value: true results: direction: portrait attributes: - name: name - description: Onap service name + description: Oclip service name scope: short type: string - name: version - description: Onap service version + description: Oclip service version scope: short type: string - name: status - description: Onap service base url + description: Oclip service base url scope: short type: url - name: status - description: Onap service status + description: Oclip service status scope: short1 type: digit - name: nodes - description: Onap service running nodes + description: Oclip service running nodes scope: long type: string - name: location - description: Onap service location + description: Oclip service location scope: long type: url http: diff --git a/framework/src/test/resources/schema-validate-invalid.yaml b/framework/src/test/resources/schema-validate-invalid.yaml index 11aaaca0..166e146b 100644 --- a/framework/src/test/resources/schema-validate-invalid.yaml +++ b/framework/src/test/resources/schema-validate-invalid.yaml @@ -8,56 +8,56 @@ info: author: Kanagaraj Manickam mkr1481@gmail.com parameters: - name: name - description: Onap SDNC name + description: Oclip SDNC name scope: short type: string short_option: n long_option: name is_optional: false - name: vendor - description: Onap SDNC vendor + description: Oclip SDNC vendor scope: short type: string short_option: e long_option: vendor is_optional: false - name: type - description: Onap SDNC type + description: Oclip SDNC type scope: short type: string short_option: y long_option: type is_optional: false - name: sdnc-version - description: Onap SDNC version + description: Oclip SDNC version scope: short type: string short_option: r long_option: sdnc-version is_optional: false - name: url - description: Onap SDNC base url + description: Oclip SDNC base url scope: short type: url short_option: l long_option: url is_optional: false - name: description - description: Onap SDNC description + description: Oclip SDNC description scope: short type: string short_option: i long_option: description is_optional: false - name: username - description: Onap SDNC username + description: Oclip SDNC username scope: short type: string short_option: g long_option: username is_optional: false - name: password - description: Onap SDNC password + description: Oclip SDNC password scope: short type: string is_secured: true @@ -65,14 +65,14 @@ parameters: long_option: password is_optional: false - name: product-name - description: Onap SDNC product-name + description: Oclip SDNC product-name scope: short type: string short_option: o long_option: product-name is_optional: false - name: protocol - description: Onap SDNC protocol + description: Oclip SDNC protocol scope: short type: string short_option: k @@ -82,52 +82,52 @@ results: direction: portrait attributes: - name: id - description: Onap SDNC ID + description: Oclip SDNC ID scope: short type: string - name: name - description: Onap SDNC name + description: Oclip SDNC name scope: short type: string - name: vendor - description: Onap SDNC vendor + description: Oclip SDNC vendor scope: short type: string - name: type - description: Onap SDNC type + description: Oclip SDNC type scope: short type: string - name: version - description: Onap SDNC version + description: Oclip SDNC version scope: short type: string - name: url - description: Onap SDNC base url + description: Oclip SDNC base url scope: short type: url - name: description - description: Onap SDNC description + description: Oclip SDNC description scope: short type: string - name: username - description: Onap SDNC username + description: Oclip SDNC username scope: short type: string - name: password - description: Onap SDNC password + description: Oclip SDNC password scope: short type: string is_secured: true - name: product-name - description: Onap SDNC product name + description: Oclip SDNC product name scope: short type: string - name: protocol - description: Onap SDNC protocol + description: Oclip SDNC protocol scope: short type: string - name: create-time - description: Onap SDNC create-time + description: Oclip SDNC create-time scope: long type: string http: diff --git a/framework/src/test/resources/schema-validate-invalidschematype.yaml b/framework/src/test/resources/schema-validate-invalidschematype.yaml index 25e1cb5e..0d5e34ce 100644 --- a/framework/src/test/resources/schema-validate-invalidschematype.yaml +++ b/framework/src/test/resources/schema-validate-invalidschematype.yaml @@ -9,65 +9,65 @@ info: name: schema-validate parameters: - name: service-name1 - description: Onap service name + description: Oclip service name type: string short_option: x long_option: service-name is_optional: false - name: service-version - description: Onap service version + description: Oclip service version type: string short_option: x long_option: service-version is_optional: false - name: service-url - description: Onap service base url + description: Oclip service base url type: url1 short_option: u long_option: service-url is_optional: false1 - name: status - description: Onap service status + description: Oclip service status type: digit short_option: z long_option: service-version is_optional: true default_value: 1 - name: node-ip - description: Onap service running node IP + description: Oclip service running node IP type: string - name: node-port - description: Onap service running node port + description: Oclip service running node port type: string - name: create-or-update - description: Onap service create or update + description: Oclip service create or update type: cfbcv default_value: true results: direction: portrait attributes: - name: name - description: Onap service name + description: Oclip service name scope: short type: string - name: version - description: Onap service version + description: Oclip service version scope: short type: string - name: status - description: Onap service base url + description: Oclip service base url scope: short type: url - name: status - description: Onap service status + description: Oclip service status scope: short1 type: digit - name: nodes - description: Onap service running nodes + description: Oclip service running nodes scope: long type: string - name: location - description: Onap service location + description: Oclip service location scope: long type: url http: diff --git a/framework/src/test/resources/schema-validate-pass.yaml b/framework/src/test/resources/schema-validate-pass.yaml index 73795206..28da9547 100644 --- a/framework/src/test/resources/schema-validate-pass.yaml +++ b/framework/src/test/resources/schema-validate-pass.yaml @@ -9,56 +9,56 @@ info: parameters: - name: name - description: Onap SDNC name + description: Oclip SDNC name scope: short type: string short_option: n long_option: name is_optional: false - name: vendor - description: Onap SDNC vendor + description: Oclip SDNC vendor scope: short type: string short_option: e long_option: vendor is_optional: false - name: type - description: Onap SDNC type + description: Oclip SDNC type scope: short type: string short_option: y long_option: type is_optional: false - name: sdnc-version - description: Onap SDNC version + description: Oclip SDNC version scope: short type: string short_option: r long_option: sdnc-version is_optional: false - name: url - description: Onap SDNC base url + description: Oclip SDNC base url scope: short type: url short_option: l long_option: url is_optional: false - name: description - description: Onap SDNC description + description: Oclip SDNC description scope: short type: string short_option: i long_option: description is_optional: false - name: username - description: Onap SDNC username + description: Oclip SDNC username scope: short type: string short_option: g long_option: username is_optional: false - name: password - description: Onap SDNC password + description: Oclip SDNC password scope: short type: string is_secured: true @@ -66,14 +66,14 @@ parameters: long_option: password is_optional: false - name: product-name - description: Onap SDNC product-name + description: Oclip SDNC product-name scope: short type: string short_option: o long_option: product-name is_optional: false - name: protocol - description: Onap SDNC protocol + description: Oclip SDNC protocol scope: short type: string short_option: k @@ -83,52 +83,52 @@ results: direction: portrait attributes: - name: id - description: Onap SDNC ID + description: Oclip SDNC ID scope: short type: string - name: name - description: Onap SDNC name + description: Oclip SDNC name scope: short type: string - name: vendor - description: Onap SDNC vendor + description: Oclip SDNC vendor scope: short type: string - name: type - description: Onap SDNC type + description: Oclip SDNC type scope: short type: string - name: version - description: Onap SDNC version + description: Oclip SDNC version scope: short type: string - name: url - description: Onap SDNC base url + description: Oclip SDNC base url scope: short type: url - name: description - description: Onap SDNC description + description: Oclip SDNC description scope: short type: string - name: username - description: Onap SDNC username + description: Oclip SDNC username scope: short type: string - name: password - description: Onap SDNC password + description: Oclip SDNC password scope: short type: string is_secured: true - name: product-name - description: Onap SDNC product name + description: Oclip SDNC product name scope: short type: string - name: protocol - description: Onap SDNC protocol + description: Oclip SDNC protocol scope: short type: string - name: create-time - description: Onap SDNC create-time + description: Oclip SDNC create-time scope: long type: string http: |