From 94ce8f09c17287f2970c3370120f41749e801c56 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Mon, 10 Sep 2018 12:27:58 +0530 Subject: Update docker with grpc server Issue-ID: CLI-122 Change-Id: I0ce2a35febc583861aaed676278f97803b413286 Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/docker/src/main/docker/Dockerfile | 4 +- deployment/zip/installer/install.sh | 4 +- .../src/main/release/bin/oclip-cmdflow-server.sh | 42 --------------------- .../zip/src/main/release/bin/oclip-grpc-server.sh | 43 ++++++++++++++++++++++ deployment/zip/src/main/release/bin/oclip-rcli.sh | 1 + .../infc/grpc/server/OpenInterfaceGrpcServer.java | 1 - 6 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh create mode 100644 deployment/zip/src/main/release/bin/oclip-grpc-server.sh diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index 21630d17..0fc2a156 100644 --- 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 6e1956f7..1bcc45d0 100644 --- 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-cmdflow-server.sh deleted file mode 100644 index d13878db..00000000 --- a/deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -#******************************************************************************* -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#******************************************************************************* - -if [ -z "$OPEN_CLI_HOME" ] -then - echo "OPEN_CLI_HOME is not set." - exit 1 -fi - -if [ "$OSTYPE" = "msys" ] -then - SEP=\; -else - SEP=: -fi - -CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs -for entry in "$OPEN_CLI_HOME/lib"/* -do - CLASSPATH=${CLASSPATH}${SEP}${entry} -done - -if [ "$OPEN_CLI_DEBUG" = "true" ] -then - java -Xdebug -Xrunjdwp:transport=dt_socket,address=${OPEN_CLI_DEBUG_PORT:-5005},server=y -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.open.infc.grpc.server.OpenInterfaceGrpcServer "$@" -else - java -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.open.infc.grpc.server.OpenInterfaceGrpcServer "$@" -fi diff --git a/deployment/zip/src/main/release/bin/oclip-grpc-server.sh b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh new file mode 100644 index 00000000..12b0a1ef --- /dev/null +++ b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh @@ -0,0 +1,43 @@ +#!/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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#******************************************************************************* + +if [ -z "$OPEN_CLI_HOME" ] +then + echo "OPEN_CLI_HOME is not set." + exit 1 +fi + +if [ "$OSTYPE" = "msys" ] +then + SEP=\; +else + SEP=: +fi + +CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs +for entry in "$OPEN_CLI_HOME/lib"/* +do + CLASSPATH=${CLASSPATH}${SEP}${entry} +done + +if [ "$OPEN_CLI_DEBUG" = "true" ] +then + java -Xdebug -Xrunjdwp:transport=dt_socket,address=${OPEN_CLI_DEBUG_PORT:-5005},server=y -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.open.infc.grpc.server.OpenInterfaceGrpcServer "$@" +else + java -classpath $CLASSPATH -DOPEN_CLI_HOME=$OPEN_CLI_HOME org.open.infc.grpc.server.OpenInterfaceGrpcServer "$@" +fi diff --git a/deployment/zip/src/main/release/bin/oclip-rcli.sh b/deployment/zip/src/main/release/bin/oclip-rcli.sh index 8caec38c..bae13f29 100644 --- 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 25f3fd1b..05e3f675 100644 --- 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); -- cgit 1.2.3-korg