From: Rodrigo Nardi <rnardi@netdef.org>
Date: Thu, 17 Aug 2023 17:32:32 +0000 (-0300)
Subject: topotest: Command using wrong python version
X-Git-Tag: base_9.1~96^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bf5a32589c05e95c391c8f419cb98126845061ad;p=matthieu%2Ffrr.git

topotest: Command using wrong python version

Changing command from python to python3.

Signed-off-by: Rodrigo Nardi <rnardi@netdef.org>
---

diff --git a/tests/topotests/lib/grpc-query.py b/tests/topotests/lib/grpc-query.py
index 5dd12d581e..8c4701c243 100755
--- a/tests/topotests/lib/grpc-query.py
+++ b/tests/topotests/lib/grpc-query.py
@@ -26,7 +26,7 @@ try:
 
     commander.cmd_raises(f"cp {CWD}/../../../grpc/frr-northbound.proto .")
     commander.cmd_raises(
-        f"python -m grpc_tools.protoc --python_out=. --grpc_python_out=. -I . frr-northbound.proto"
+        f"python3 -m grpc_tools.protoc --python_out=. --grpc_python_out=. -I . frr-northbound.proto"
     )
 except Exception as error:
     logging.error("can't create proto definition modules %s", error)
@@ -36,17 +36,6 @@ try:
     sys.path[0:0] = "."
     import frr_northbound_pb2
     import frr_northbound_pb2_grpc
-
-    # Would be nice if compiling the modules internally from the source worked
-    # # import grpc_tools.protoc
-    # # proto_include = pkg_resources.resource_filename("grpc_tools", "_proto")
-    # from grpc_tools.protoc import _proto_file_to_module_name, _protos_and_services
-    # try:
-    #     frr_northbound_pb2, frr_northbound_pb2_grpc = _protos_and_services(
-    #         "frr_northbound.proto"
-    #     )
-    # finally:
-    #     os.chdir(CWD)
 except Exception as error:
     logging.error("can't import proto definition modules %s", error)
     raise