commit efa52b75411d9e728c2d38fde92c08d4edaec707
author Daniele Moro <daniele@opennetworking.org> Wed Feb 12 22:10:18 2020 -0800
committer Daniele Moro <daniele@opennetworking.org> Fri Feb 14 14:52:27 2020 -0800
tree 8a7a5c1372036544560016d290d009b7caadf7b4
parent ac942065007e076c31b4c94b6d92bf505922577e

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: Ic66a0a1a0f1e68c95fd94f443112ee4fb8b1bad5

lib/xos-api/xosapi/chameleon_client/grpc_client.py

diff --git a/lib/xos-api/xosapi/chameleon_client/grpc_client.py b/lib/xos-api/xosapi/chameleon_client/grpc_client.py
index 7d3839d..2b2d1e0 100644
--- a/lib/xos-api/xosapi/chameleon_client/grpc_client.py
+++ b/lib/xos-api/xosapi/chameleon_client/grpc_client.py
@@ -60,7 +60,8 @@
         self.reconnect_callback = reconnect_callback
         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'))
 
@@ -254,7 +255,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 '
@@ -263,6 +264,7 @@
                     self.work_dir,
                     ':'.join([os.environ['PATH'], self.plugin_dir]),
                     chameleon_base_dir,
+                    self.google_api_dir,
                     self.plugin_dir,
                     fname)
             )