commit f97bf09878bd538a0879932a6cad8fab7d641dcd
author Zack Williams <zdw@opennetworking.org> Thu Mar 22 21:27:28 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Mon Mar 26 16:22:23 2018 -0700
tree 5b220f0dadfa0a48fda055809f4555990ebc0d00
parent 80a36b7bb0e811baef9e57d5798ef968d0523769

[CORD-2871]
Fix protobuf integration in prep for CORD-2276

Change-Id: I67ffa17d97d97e9a226269e99de76c236a431dd1

grpc_client/grpc_client.py

diff --git a/grpc_client/grpc_client.py b/grpc_client/grpc_client.py
index 9a3224f..316970b 100644
--- a/grpc_client/grpc_client.py
+++ b/grpc_client/grpc_client.py
@@ -34,7 +34,6 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 from werkzeug.exceptions import ServiceUnavailable
 
-from chameleon.protos import third_party
 from chameleon.protos.schema_pb2_grpc import SchemaServiceStub
 from google.protobuf.empty_pb2 import Empty
 
@@ -236,9 +235,6 @@
         web server gateway python file *_gw.py.
         :return: None
         """
-        google_api_dir = os.path.abspath(os.path.join(
-            os.path.dirname(__file__), '../protos/third_party'
-        ))
 
         chameleon_base_dir = os.path.abspath(os.path.join(
             os.path.dirname(__file__), '../..'
@@ -254,7 +250,6 @@
                 'env PATH=%s PYTHONPATH=%s '
                 'python -m grpc.tools.protoc '
                 '-I. '
-                '-I%s '
                 '--python_out=. '
                 '--grpc_python_out=. '
                 '--plugin=protoc-gen-gw=%s/gw_gen.py '
@@ -264,8 +259,7 @@
                 '%s' % (
                     self.work_dir,
                     ':'.join([os.environ['PATH'], self.plugin_dir]),
-                    ':'.join([google_api_dir, chameleon_base_dir]),
-                    google_api_dir,
+                    chameleon_base_dir,
                     self.plugin_dir,
                     self.plugin_dir,
                     '--swagger_out=. ' if need_swagger else '',