Update docker with grpc server

Issue-ID: CLI-122

Change-Id: I0ce2a35febc583861aaed676278f97803b413286
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 21630d1..0fc2a15 100644 (file)
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -34,10 +34,10 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \
     apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/* && \
     chmod +x  $OPEN_CLI_HOME/bin/oclip.sh  && \
     chmod +x  $OPEN_CLI_HOME/bin/oclip-rcli.sh  && \
-    chmod +x  $OPEN_CLI_HOME/bin/oclip-cmdflow-server.sh  && \
+    chmod +x  $OPEN_CLI_HOME/bin/oclip-grpc-server.sh  && \
     ln  $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/oclip  && \
     ln  $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/onap  && \
-    ln  $OPEN_CLI_HOME/bin/oclip-cmdflow-server.sh /usr/sbin/oclip-grpc  && \
+    ln  $OPEN_CLI_HOME/bin/oclip-grpc-server.sh /usr/sbin/oclip-grpc  && \
     ln  $OPEN_CLI_HOME/bin/oclip-rcli.sh /usr/sbin/oclipr  && \
     if [ ! -d  $OPEN_CLI_HOME/data ]; then mkdir  $OPEN_CLI_HOME/data; fi  && \
     if [ ! -d  $OPEN_CLI_HOME/open-cli-schema ]; then mkdir  $OPEN_CLI_HOME/open-cli-schema; fi && \

diff --git a/deployment/zip/installer/install.sh b/deployment/zip/installer/install.sh
index 6e1956f..1bcc45d 100644 (file)
--- a/deployment/zip/installer/install.sh
+++ b/deployment/zip/installer/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*******************************************************************************
-# Copyright 2017 Huawei Technologies Co., Ltd.
+# Copyright 2018 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +26,13 @@ if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi
 
 chmod +x ./bin/oclip.sh
 chmod +x ./bin/oclip-rcli.sh
+chmod +x ./bin/oclip-grpc-server.sh
 
 #Make oclip available in path
 ln -sf ./bin/oclip.sh /usr/bin/oclip
 ln -sf ./bin/oclip.sh /usr/bin/onap
 ln -sf ./bin/oclip-rcli.sh /usr/bin/roclip
+ln -sf ./bin/oclip-grpc-server.sh /usr/bin/oclip-grpc
 
 #Print the version
 oclip -v

diff --git a/deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh
similarity index 96%
rename from deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh
rename to deployment/zip/src/main/release/bin/oclip-grpc-server.sh
index d13878d..12b0a1e 100644 (file)
--- a/deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh
+++ b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #*******************************************************************************
+# Copyright 2017 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/deployment/zip/src/main/release/bin/oclip-rcli.sh b/deployment/zip/src/main/release/bin/oclip-rcli.sh
index 8caec38..bae13f2 100644 (file)
--- a/deployment/zip/src/main/release/bin/oclip-rcli.sh
+++ b/deployment/zip/src/main/release/bin/oclip-rcli.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #*******************************************************************************
+# Copyright 2018 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
index 25f3fd1..05e3f67 100644 (file)
--- a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
+++ b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
@@ -147,7 +147,6 @@ public class OpenInterfaceGrpcServer {
 
             OpenRemoteCli cli = new OpenRemoteCli(req.getProduct(), req.getArgsList().toArray(new String [] {}));
             cli.handle();
-
             logger.info(cli.getResult());
             Result reply = Result.newBuilder().setExitCode(cli.getExitCode()).setOutput(cli.getResult()).build();
             responseObserver.onNext(reply);