From 14880ec3b183f52ea3f3fea460adf807c8643b70 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 12 Oct 2017 08:53:57 +0530 Subject: [PATCH] Fix rebased conflicts from master Issue-Id: CLI-66 Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5 Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/docker/src/main/docker/Dockerfile | 2 +- main/src/main/resources/{onap-readme.txt => oclip-readme.txt} | 0 .../src/test/java/org/onap/cli/validation/OnapValidationTest.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename main/src/main/resources/{onap-readme.txt => oclip-readme.txt} (100%) diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index e23a3c1b..a12b2264 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -35,7 +35,7 @@ RUN chmod +x ./bin/oclip.sh && \ if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi #Create the readable README -RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/onap-readme.txt +RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/oclip-readme.txt #RTE: lighttpd COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/oclip-readme.txt similarity index 100% rename from main/src/main/resources/onap-readme.txt rename to main/src/main/resources/oclip-readme.txt diff --git a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java index 8d78d40f..21573138 100644 --- a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java +++ b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java @@ -57,7 +57,7 @@ public class OnapValidationTest { } @Test - public void validateCommandsResult() throws IOException, OnapCommandException { + public void validateCommandSchemas() throws IOException, OnapCommandException { for (String version: OnapCommandRegistrar.getRegistrar().getAvailableProductVersions()) { OnapCommandRegistrar.getRegistrar().setEnabledProductVersion(version); System.out.println(version); -- 2.16.6