commit fddb175031065ba64bf5ae47f973c6c15ab80b69
author Girish Gowdra <girish@opennetworking.org> Fri Sep 04 17:59:22 2020 -0700
committer Girish Gowdra <girish@opennetworking.org> Fri Sep 04 17:59:22 2020 -0700
tree d690bf5163a4d4ec46d361ce3d5d9e67444b8225
parent 46aec6c7d82c10bc7fa648719b49a42ada92d6f1

VOL-3419: Update the tools image to use grpc c++ 1.31.1.
The latest grpc c++ version provides mechanisms to fine tune thread
pool settings in 'sync' mode of grpc API execution.
This version of grpc will be used to acheive some high performance
when agent takes up more task later to replicate the flows instead
of adapter doing it for the agent.

Change-Id: I90736d7b2d1d93554caa451fd5280451a7c9b6e8

Makefile

diff --git a/Makefile b/Makefile
index 3f9866d..2d2cd67 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 GTEST_VER         ?= release-1.8.0
 CMOCK_VER         ?= 0207b30
 GMOCK_GLOBAL_VER  ?= 1.0.2
-GRPC_VER          ?= v1.27.1
+GRPC_VER          ?= v1.31.1
 
 # Docker related
 DOCKER_LABEL_VCS_DIRTY     = false

VERSION

diff --git a/VERSION b/VERSION
index 7dea76e..227cea2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.1
+2.0.0

docker/Dockerfile.openolt-test

diff --git a/docker/Dockerfile.openolt-test b/docker/Dockerfile.openolt-test
index 1326df8..0ece9e6 100644
--- a/docker/Dockerfile.openolt-test
+++ b/docker/Dockerfile.openolt-test
@@ -24,28 +24,30 @@
     clang=1:3.8-33ubuntu3.1 \
     libc++-dev=3.7.0-1ubuntu0.1 \
     unzip=6.0-20ubuntu1 \
-    libssl-dev=1.0.2g-1ubuntu4.15 \
+    libssl-dev=1.0.2g-1ubuntu4.16 \
     gawk=1:4.1.3+dfsg-0.1 \
     debhelper=9.20160115ubuntu3 \
     dh-systemd=1.29ubuntu4 \
     init-system-helpers=1.29ubuntu4 \
-    curl=7.47.0-1ubuntu2.14 \
-    cmake=3.5.1-1ubuntu3 \
+    curl=7.47.0-1ubuntu2.16 \
     ccache=3.2.4-1 \
     g++-4.9=4.9.3-13ubuntu2 \
     wget=1.17.1-1ubuntu1.5 \
-    ca-certificates=20170717~16.04.2 \
-    lcov=1.12-2 && \
+    ca-certificates=20190110~16.04.1 \
+    lcov=1.12-2 \
+    libgoogle-glog-dev=0.3.4-0.1 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install cmake (need cmake version 3.15.0 or later to compile grpc c++ 1.31.1)
+RUN wget -q -O cmake-linux.sh https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.sh && \
+sh cmake-linux.sh -- --skip-license && rm cmake-linux.sh
+
 ARG GRPC_VER
 # Download, compile and install gRPC. Remove the source and build artificats after install.
-RUN cd /tmp && git clone -b $GRPC_VER  https://github.com/grpc/grpc /tmp/grpc && \
-    cd /tmp/grpc && git submodule update --init && \
-    cd /tmp/grpc/third_party/protobuf && ./autogen.sh && ./configure && \
-    make && make install && ldconfig && \
-    cd /tmp/grpc && make && make install && ldconfig && \
+RUN cd /tmp && git clone --recurse-submodules -b $GRPC_VER https://github.com/grpc/grpc && \
+    cd /tmp/grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF ../.. && \
+    make && make install && cd /tmp && \
     rm -rf /tmp/grpc
 
 ARG GTEST_VER