]> git.puffer.fish Git - mirror/frr.git/commitdiff
topotests: look for python3 exabgp
authorLouis Scalbert <louis.scalbert@6wind.com>
Tue, 28 Nov 2023 11:44:13 +0000 (12:44 +0100)
committerLouis Scalbert <louis.scalbert@6wind.com>
Thu, 14 Dec 2023 09:57:29 +0000 (10:57 +0100)
Look for python3 exabgp instead of python2.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
tests/topotests/lib/topogen.py

index c77a9871177009fd0bbbe0ffe8e92a2bbb298937..f58a6668b6596dc003a0fdae54760e3dcdc40101 100644 (file)
@@ -102,14 +102,14 @@ def get_exabgp_cmd(commander=None):
     exacmd = commander.get_exec_path("exabgp")
     if exacmd and exacmd_version_ok(exacmd):
         return exacmd
-    py2_path = commander.get_exec_path("python2")
-    if py2_path:
-        exacmd = py2_path + " -m exabgp"
+    py3_path = commander.get_exec_path("python3")
+    if py3_path:
+        exacmd = py3_path + " -m exabgp"
         if exacmd_version_ok(exacmd):
             return exacmd
-        py2_path = commander.get_exec_path("python")
-    if py2_path:
-        exacmd = py2_path + " -m exabgp"
+    py3_path = commander.get_exec_path("python")
+    if py3_path:
+        exacmd = py3_path + " -m exabgp"
         if exacmd_version_ok(exacmd):
             return exacmd
     return None