commit 538eba77a6c8c319ec577aa7dcc56474a3ba66f5
author Daniele Moro <daniele@opennetworking.org> Wed Feb 12 22:07:24 2020 -0800
committer Daniele Moro <daniele@opennetworking.org> Fri Feb 14 14:49:31 2020 -0800
tree e4914e205efe032f8766fc1e8a495da29b16449f
parent 895d3f2f0aafd904b9e49d6af61d4aa43e113d79

Use google.api instead of custom googleapi package

Use the standard google.api package to not create conflicts with other
proto definition that uses the same package.

Change-Id: I264db977a2316ced0fdfb6ab8e499a1258726cb7

grpc_client/grpc_client.py

diff --git a/grpc_client/grpc_client.py b/grpc_client/grpc_client.py
index f0c5f11..f00b06e 100644
--- a/grpc_client/grpc_client.py
+++ b/grpc_client/grpc_client.py
@@ -59,6 +59,8 @@
         self.credentials = credentials
         self.restart_on_disconnect = restart_on_disconnect
 
+        self.google_api_dir = os.path.abspath(os.path.join(
+            os.path.dirname(__file__), '../protos'))
         self.plugin_dir = os.path.abspath(os.path.join(
             os.path.dirname(__file__), '../protoc_plugins'))
 
@@ -249,7 +251,7 @@
                 'cd %s && '
                 'env PATH=%s PYTHONPATH=%s '
                 'python -m grpc.tools.protoc '
-                '-I. '
+                '-I. -I %s '
                 '--python_out=. '
                 '--grpc_python_out=. '
                 '--plugin=protoc-gen-gw=%s/gw_gen.py '
@@ -260,6 +262,7 @@
                     self.work_dir,
                     ':'.join([os.environ['PATH'], self.plugin_dir]),
                     chameleon_base_dir,
+                    self.google_api_dir,
                     self.plugin_dir,
                     self.plugin_dir,
                     '--swagger_out=. ' if need_swagger else '',