summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-10-12 08:53:57 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-20 14:03:07 +0530
commit14880ec3b183f52ea3f3fea460adf807c8643b70 (patch)
treeb31ea050a710686ed6113eca7431b36dbe5ef349
parenta96cd9cbb9b23f4b7ad4e051a5dad7602ac967f0 (diff)
Fix rebased conflicts from master
Issue-Id: CLI-66 Change-Id: I1cc275c2794d9c7e4b951f648eb8cc1e569973c5 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--deployment/docker/src/main/docker/Dockerfile2
-rw-r--r--main/src/main/resources/oclip-readme.txt (renamed from main/src/main/resources/onap-readme.txt)0
-rw-r--r--validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java2
3 files changed, 2 insertions, 2 deletions
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
index a2048606..a2048606 100644
--- a/main/src/main/resources/onap-readme.txt
+++ b/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);