aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-09-11 04:05:48 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-11 04:05:48 +0000
commita710113a4929cf77f6c702be65d1382037236afe (patch)
treea688a7b0a80cbe13ca15f4db06cb792a6c628526
parent3cd5aa28759518c265a27abb0ff54782373957cc (diff)
parent94ce8f09c17287f2970c3370120f41749e801c56 (diff)
Merge changes I0ce2a35f,I78097e7e
* changes: Update docker with grpc server VTP: Enable debug log for gRPC server
-rw-r--r--deployment/docker/src/main/docker/Dockerfile4
-rw-r--r--deployment/zip/installer/install.sh4
-rw-r--r--deployment/zip/src/main/release/bin/oclip-grpc-server.sh (renamed from deployment/zip/src/main/release/bin/oclip-cmdflow-server.sh)1
-rw-r--r--deployment/zip/src/main/release/bin/oclip-rcli.sh1
-rw-r--r--grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java2
5 files changed, 8 insertions, 4 deletions
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-grpc-server.sh
index d13878db..12b0a1ef 100644
--- 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 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 0f389f31..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,7 @@ 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);
responseObserver.onCompleted();