diff options
8 files changed, 21 insertions, 31 deletions
diff --git a/deployment/zip/src/main/release/bin/oclip.sh b/deployment/zip/src/main/release/bin/oclip.sh index e24cdb4a..2ae1a27c 100755 --- a/deployment/zip/src/main/release/bin/oclip.sh +++ b/deployment/zip/src/main/release/bin/oclip.sh @@ -31,6 +31,7 @@ fi CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs export PATH=$OPEN_CLI_HOME/bin:$PATH +export TERM=xterm-color for entry in "$OPEN_CLI_HOME/lib"/* do diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 74a3b7a3..3b3441a8 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1 +1,3 @@ lfdocs-conf +sphinx>=4.2.0 # BSD +sphinx-rtd-theme>=1.0.0 # MIT diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandType.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandType.java index e874a14e..eb22765c 100644 --- a/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandType.java +++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommandType.java @@ -27,7 +27,8 @@ public enum OnapCommandType { AUTH, CATALOG, - CMD; + CMD, + SYSTEM; /** * Get parameter type. diff --git a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java index 912ea23d..de462b4f 100644 --- a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java +++ b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.commons.io.IOUtils; import org.onap.cli.fw.cmd.OnapCommand; +import org.onap.cli.fw.cmd.OnapCommandType; import org.onap.cli.fw.cmd.dummy.OnapCommandDummy; import org.onap.cli.fw.conf.OnapCommandConfig; import org.onap.cli.fw.conf.OnapCommandConstants; @@ -413,9 +414,9 @@ public class OnapCommandRegistrar { } //don't expose system commands for user usage - //if (cmd.getInfo().getCommandType().name().equalsIgnoreCase(OnapCommandType.SYSTEM.name())) { - // continue; - //} + if (cmd.getInfo().getCommandType().name().equalsIgnoreCase(OnapCommandType.SYSTEM.name())) { + continue; + } attrSrv.getValues().add(cmd.getInfo().getService()); attrDesc.getValues().add(cmd.getDescription()); diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java index a1c84a41..b68474db 100644 --- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java +++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java @@ -471,9 +471,7 @@ public class OnapCommandExecutionStore { } private File getExecutionDir(String executionId) throws OnapCommandExecutionNotFound { - File []f = new File(getBasePath()).listFiles((dir, name) -> { - return name.startsWith(executionId); - }); + File []f = new File(getBasePath()).listFiles((dir, name) -> name.startsWith(executionId)); if (f.length == 0) { throw new OnapCommandExecutionNotFound(executionId); 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 17d14235..775d0601 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 @@ -108,7 +108,6 @@ public class OnapCommandParameterTest { param.setName("name"); param.setParameterType(OnapCommandParameterType.ARRAY); param.setValue("value"); - assertEquals("[\"1\",\"2\",\"3\"]", param.getValue()); } @@ -118,7 +117,6 @@ public class OnapCommandParameterTest { param.setName("name"); param.setParameterType(OnapCommandParameterType.MAP); param.setValue("value"); - assertEquals("{\"One\":\"1\",\"Two\":\"2\",\"Three\":\"3\"}", param.getValue()); } @Test(expected = OnapCommandInvalidParameterValue.class) diff --git a/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java b/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java index 123521bf..65a7f661 100644 --- a/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java +++ b/main/src/main/java/org/onap/cli/main/utils/OnapCliArgsParser.java @@ -100,7 +100,8 @@ public class OnapCliArgsParser { } int positionalIdx = 0; - for (int i = 0; i < args.size(); i++) { + int i = 0; + while(i < args.size()) { String paramName = null; if (shortOptionMap.containsKey(args.get(i))) { paramName = shortOptionMap.get(args.get(i)); @@ -113,6 +114,7 @@ public class OnapCliArgsParser { if ((i + 1) == args.size() || args.get(i + 1).startsWith("-")) { if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.BOOL)) { paramMap.get(paramName).setValue(true); + i++; continue; } throw new OnapCliArgumentValueMissing(args.get(i)); @@ -121,26 +123,26 @@ public class OnapCliArgsParser { if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.JSON)) { paramMap.get(paramName).setValue(readJsonStringFromUrl(args.get(i + 1), paramMap.get(paramName).getName())); - i++; + i += 2; continue; } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.TEXT)) { paramMap.get(paramName).setValue(readTextStringFromUrl(args.get(i + 1), paramMap.get(paramName).getName())); - i++; + i += 2; continue; } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.YAML)) { String value = readYamlStringFromUrl(args.get(i + 1), paramMap.get(paramName).getName()); paramMap.get(paramName).setValue(value); - i++; + i += 2; continue; } else if (paramMap.get(paramName).getParameterType().equals(OnapCommandParameterType.BYTE)) { paramMap.get(paramName).setValue(readBytesFromUrl(args.get(i + 1), paramMap.get(paramName).getName())); - i++; + i += 2; continue; } else if (paramMap.get(paramName).getParameterType() @@ -150,7 +152,7 @@ public class OnapCliArgsParser { list.add(readTextStringFromUrl(args.get(i + 1), paramMap.get(paramName).getName())); paramMap.get(paramName).setValue(list); - i++; + i += 2; continue; } else if (paramMap.get(paramName).getParameterType() @@ -170,13 +172,13 @@ public class OnapCliArgsParser { map.put(argArr[0], argArr[1]); paramMap.get(paramName).setValue(map); - i++; + i += 2; continue; } paramMap.get(paramName).setValue(args.get(i + 1)); - i++; + i += 2; continue; } @@ -190,6 +192,7 @@ public class OnapCliArgsParser { paramMap.get(positionArgs.get(positionalIdx)).setValue(args.get(i)); positionalIdx++; + i++; } params.clear(); diff --git a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java index 05249898..e99bbfc1 100644 --- a/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java +++ b/main/src/test/java/org/onap/cli/main/utils/OnapCliUtilsTest.java @@ -281,8 +281,6 @@ public class OnapCliUtilsTest { param1.setParameterType(OnapCommandParameterType.MAP); OnapCliArgsParser.populateParams(paramslist, Arrays.asList("show", "--map", "param1=value1", "--map", "param2")); - Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}", - paramslist.iterator().next().getValue().toString()); } @Test(expected = OnapCliInvalidArgument.class) @@ -296,8 +294,6 @@ public class OnapCliUtilsTest { param1.setParameterType(OnapCommandParameterType.MAP); OnapCliArgsParser.populateParams(paramslist, Arrays.asList("show", "-o", "param1=value1", "-o", "param2")); - Assert.assertEquals("{\"param1\":\"value1\",\"param2\"}", - paramslist.iterator().next().getValue().toString()); } @Test(expected = OnapCliInvalidArgument.class) @@ -313,8 +309,6 @@ public class OnapCliUtilsTest { paramargs.setParameterType(OnapCommandParameterType.STRING); OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args)); List<String> expectedList = Arrays.asList(args); - Assert.assertEquals("positional-args", - expectedList.get(1), paramslist.iterator().next().getValue()); } @Test(expected = OnapCliInvalidArgument.class) @@ -328,8 +322,6 @@ public class OnapCliUtilsTest { boolparam.setParameterType(OnapCommandParameterType.BOOL); OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args)); - List<String> expectedList = Arrays.asList(args); - Assert.assertEquals("true", paramslist.iterator().next().getValue()); } @Test(expected = OnapCliInvalidArgument.class) @@ -343,8 +335,6 @@ public class OnapCliUtilsTest { boolparam.setParameterType(OnapCommandParameterType.BOOL); OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args)); - List<String> expectedList = Arrays.asList(args); - Assert.assertEquals("true", paramslist.iterator().next().getValue()); } @Test(expected = OnapCliArgumentValueMissing.class) @@ -360,8 +350,6 @@ public class OnapCliUtilsTest { "file:" + resourcesDirectory, "--json-param" }; jsonparam.setParameterType(OnapCommandParameterType.JSON); OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args)); - List<String> expectedList = Arrays.asList(args); - Assert.assertEquals("--json-param", paramslist.iterator().next().getValue()); } @@ -376,8 +364,6 @@ public class OnapCliUtilsTest { String[] args = new String[] { "-j", "file:" + resourcesDirectory, "-j" }; jsonparam.setParameterType(OnapCommandParameterType.JSON); OnapCliArgsParser.populateParams(paramslist, Arrays.asList(args)); - List<String> expectedList = Arrays.asList(args); - Assert.assertEquals("--json-param", paramslist.iterator().next().getValue()); } |