diff options
7 files changed, 35 insertions, 5 deletions
diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml index c486fe9c..c2c32cb9 100644 --- a/deployment/docker/src/main/docker/docker-compose.yaml +++ b/deployment/docker/src/main/docker/docker-compose.yaml @@ -1,7 +1,6 @@ version: '2.0' services: - occ: image: onap/cli environment: @@ -19,3 +18,13 @@ services: image: onap/cli environment: CLI_MODE: 'console' + + dev: + stdin_open: true + tty: true + image: onap/cli + environment: + CLI_DEV: "true" + CLI_MODE: 'console' + ports: + - 5005:5005 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 019eb824..01d4742e 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java @@ -58,6 +58,8 @@ public class OnapCommandRegistrar { private boolean isInteractiveMode = false; + private boolean isDevMode = Boolean.getBoolean(System.getenv(Constants.CLI_DEV_MODE)); + private OnapCommandParameterCache paramCache = new OnapCommandParameterCache(); public boolean isInteractiveMode() { @@ -80,6 +82,15 @@ public class OnapCommandRegistrar { paramCache.remove(this.getEnabledProductVersion(), paramName); } + public boolean isDevMode() { + return isDevMode; + } + + public void setDevMode(boolean isDevMode) { + this.isDevMode = isDevMode; + } + + private static OnapCommandRegistrar registrar = null; /** diff --git a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java index 23dfbbbe..d7e277c7 100644 --- a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java +++ b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java @@ -195,8 +195,12 @@ public class Constants { public static final String USE_DIRECTIVE = "use"; public static final String PARAM_CACHE_FILE_NAME = "cli.parameter.cache.file"; + + public static final String CLI_DEV_MODE = "CLI_DEV"; + private Constants() { } } + 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 b31b75cf..ec735cfb 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 @@ -21,6 +21,7 @@ import com.jayway.jsonpath.JsonPath; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; import org.onap.cli.fw.OnapCommand; +import org.onap.cli.fw.OnapCommandRegistrar; import org.onap.cli.fw.ad.OnapCredentials; import org.onap.cli.fw.ad.OnapService; import org.onap.cli.fw.cmd.OnapHttpCommand; @@ -1654,7 +1655,7 @@ public class OnapCommandUtils { */ public static List<ExternalSchema> loadExternalSchemasFromJson() throws OnapCommandException { List<ExternalSchema> schemas = new ArrayList<>(); - if (!isJsonFileDiscovered()) { + if (OnapCommandRegistrar.getRegistrar().isDevMode() || !isJsonFileDiscovered()) { schemas = findAllExternalSchemas(); if (!schemas.isEmpty()) { persist(schemas); diff --git a/framework/src/test/resources/short-options.txt b/framework/src/test/resources/short-options.txt new file mode 100644 index 00000000..d5696309 --- /dev/null +++ b/framework/src/test/resources/short-options.txt @@ -0,0 +1 @@ +a d f h m p s t u v
\ No newline at end of file diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index c175f67b..0920f84b 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -19,9 +19,7 @@ package org.onap.cli.main; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.io.IOUtils; import org.onap.cli.fw.OnapCommand; diff --git a/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java b/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java index be88aed0..3ab4cceb 100644 --- a/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java +++ b/main/src/main/java/org/onap/cli/main/utils/OnapCliUtils.java @@ -261,7 +261,13 @@ public class OnapCliUtils { private static String readTextStringFromUrl(String input, String argName) throws OnapCliInvalidArgument { try { - return FileUtils.readFileToString(new File(input)); + File file = new File(input); + if (file.isFile()) { + return FileUtils.readFileToString(file); + } else { + return input; + } + } catch (IOException e) { throw new OnapCliInvalidArgument(argName, e); } |