From 14880ec3b183f52ea3f3fea460adf807c8643b70 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Thu, 12 Oct 2017 08:53:57 +0530
Subject: Fix rebased conflicts from master

Issue-Id: CLI-66

Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/docker/src/main/docker/Dockerfile       |  2 +-
 main/src/main/resources/oclip-readme.txt           | 25 ++++++++++++++++++++++
 main/src/main/resources/onap-readme.txt            | 25 ----------------------
 .../onap/cli/validation/OnapValidationTest.java    |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 main/src/main/resources/oclip-readme.txt
 delete mode 100644 main/src/main/resources/onap-readme.txt

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/oclip-readme.txt b/main/src/main/resources/oclip-readme.txt
new file mode 100644
index 00000000..a2048606
--- /dev/null
+++ b/main/src/main/resources/oclip-readme.txt
@@ -0,0 +1,25 @@
+OPEN Command-line interface (CLI)
+==================================
+
+ _____                    _____  _     _____
+|  _  |                  /  __ \| |   |_   _|
+| | | |_ __   ___ _ __   | /  \/| |     | |
+| | | | '_ \ / _ \ '_ \  | |    | |     | |
+\ \_/ / |_) |  __/ | | | | \__/\| |_____| |_
+ \___/| .__/ \___|_| |_|  \____/\_____/\___/
+      | |
+      |_|
+
+Provides unified commands to operate any cloud enabled software
+products from Linux/Web console. Configure the following environment
+variables, before using it:
+
+1. OPEN_CLI_HOST_URL - Catalog service URL or a service URL
+2. OPEN_CLI_HOST_USERNAME - Service user name
+3. OPEN_CLI_HOST_PASSWORD - Service password
+
+To know the CLI version, type oclip [-v|--version]
+To know the CLI usage, type oclip [-h|--help]
+To know the usage of sub commands, type oclip <command> [-h|--help]
+
+To know more, please refer the wiki https://wiki.onap.org
diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/onap-readme.txt
deleted file mode 100644
index a2048606..00000000
--- a/main/src/main/resources/onap-readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-OPEN Command-line interface (CLI)
-==================================
-
- _____                    _____  _     _____
-|  _  |                  /  __ \| |   |_   _|
-| | | |_ __   ___ _ __   | /  \/| |     | |
-| | | | '_ \ / _ \ '_ \  | |    | |     | |
-\ \_/ / |_) |  __/ | | | | \__/\| |_____| |_
- \___/| .__/ \___|_| |_|  \____/\_____/\___/
-      | |
-      |_|
-
-Provides unified commands to operate any cloud enabled software
-products from Linux/Web console. Configure the following environment
-variables, before using it:
-
-1. OPEN_CLI_HOST_URL - Catalog service URL or a service URL
-2. OPEN_CLI_HOST_USERNAME - Service user name
-3. OPEN_CLI_HOST_PASSWORD - Service password
-
-To know the CLI version, type oclip [-v|--version]
-To know the CLI usage, type oclip [-h|--help]
-To know the usage of sub commands, type oclip <command> [-h|--help]
-
-To know more, please refer the wiki https://wiki.onap.org
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);
-- 
cgit 1.2.3-korg