Fix rebased conflicts from master

Issue-Id: CLI-66

Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index e23a3c1..a12b226 100644 (file)
--- 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 8d78d40..2157313 100644 (file)
--- 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);