Received: from a2i649.smtp2go.com (a2i649.smtp2go.com [103.47.206.137]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 9BCCE781B7C for <~alpine/aports@lists.alpinelinux.org>; Sun, 22 Dec 2019 05:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpcorp.com; s=a1-4; h=Feedback-ID:X-Smtpcorp-Track:Message-Id:Date: Subject:To:From:Reply-To:Sender:List-Unsubscribe; bh=eiFIZETqKVS/H0k9TsfwmBD2821MKGFyOv9IwMXq+Ds=; b=TUdvpNE6qW6Wv4HCYcDg/YQz4s 3Px492JiVS+QzYh9ioNLfIBpGqnyK3kh3U6Nl+hdOJZD2AGOPJcqbUzNs8umo1KCmX8zIfhT9EYDj 3jvGU0gTw3D5RQSyNREziKiKsnTEGdtUsQJ8iDZv/m8Gj8sNdqPHpsZoePsZSL76WRsWElS6rP5Kz 1QUkHNjJCC+2+RJdLRFqII4dMfuogjpBhUJfPg1umACzvc3XwEd+NQmooZ+MUC0Rq7KFfisIka3Pk /cKpoyepPnkfvWuYifgGxK9LC1NBkgmy4LhWkyAVfNtl3/lQv8Vhxb46aRGswGH0D5M3mLmr2T5IX 7VnfCjZA==; Received: from [10.173.255.233] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92-S2G) (envelope-from ) id 1iitVC-ED4tw5-AW; Sun, 22 Dec 2019 05:10:02 +0000 Received: from [10.149.28.108] (helo=localhost) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92-S2G) (envelope-from ) id 1iitVB-IbZuPP-8v; Sun, 22 Dec 2019 05:10:01 +0000 From: Daniel Corbe To: ~alpine/aports@lists.alpinelinux.org Cc: Daniel Corbe Subject: [PATCH] Bump FRR to 7.2 Date: Sun, 22 Dec 2019 00:09:52 -0500 Message-Id: <20191222050952.18692-1-daniel@corbe.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Smtpcorp-Track: 1iitVUmPZIee8v.BsqoATfkX Feedback-ID: 10661m:10661aegzayD:10661svSajSL3NZ X-Report-Abuse: Please forward a copy of this message, including all headers, to It appears as if the previous maintainer does not have a vaild E-Mail address and I would like to see frr bumped to 7.2 in testing --- testing/frr/APKBUILD | 13 +- testing/frr/py3.patch | 1001 ----------------------------------------- 2 files changed, 6 insertions(+), 1008 deletions(-) delete mode 100644 testing/frr/py3.patch diff --git a/testing/frr/APKBUILD b/testing/frr/APKBUILD index 1ed1f67a44..ee1a345083 100644 --- a/testing/frr/APKBUILD +++ b/testing/frr/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: Christian Franke +# Maintainer: Daniel Corbe pkgname=frr -pkgver=7.1 +pkgver=7.2 pkgrel=1 pkgdesc="Free Range Routing is a fork of Quagga" pkgusers="frr" @@ -8,7 +8,7 @@ pkggroups="frr frrvty" url="https://frrouting.org/" arch="all" license="GPL-2.0-or-later" -depends="iproute2 bash" +depends="iproute2 bash libcap" makedepends="autoconf automake libtool bsd-compat-headers c-ares-dev @@ -22,6 +22,7 @@ makedepends="autoconf automake libtool readline-dev rtrlib-dev texinfo + libcap-dev " checkdepends="py3-pytest" install="$pkgname.pre-install" @@ -34,7 +35,6 @@ subpackages="$pkgname-dbg " source="https://github.com/FRRouting/frr/archive/frr-$pkgver.tar.gz frr.initd - py3.patch " builddir="$srcdir"/$pkgname-$pkgname-$pkgver @@ -125,6 +125,5 @@ snmp() { mv "$pkgdir"/usr/lib/frr/libfrrsnmp.* "$subpkgdir/usr/lib/frr" } -sha512sums="d1020607c4c142cc2895c514dcee232a6711a01e63e35a4005249fba9a2b491ebede6dfcfc8d1e885d9d93aff34c99aaced987141040f437eba6779007d06817 frr-7.1.tar.gz -b495b2be9f2cbb065104ccc0c3474471e870b53ac62ed4fba40020c8d50866e637a99ef3d7af5de1018ff659c4757baac4f40d7648a9de99ed14db33c8992b54 frr.initd -56153758bb543229e54343f15abdb18661317d42f2d244300c298a8ea5b6cd21d573a7379d184541f9c6110028c2049d9911849a14ae3febcc299e5a5050b2ae py3.patch" +sha512sums="5a5852964e2b62dad74a516b9ee53377feebacfa2ce1860a82e6a6ee6dfaf8055a0dbb53b39550fa9098e352c96b434a3d41ea36963f6370e41265fb96d61150 frr-7.2.tar.gz +b495b2be9f2cbb065104ccc0c3474471e870b53ac62ed4fba40020c8d50866e637a99ef3d7af5de1018ff659c4757baac4f40d7648a9de99ed14db33c8992b54 frr.initd" diff --git a/testing/frr/py3.patch b/testing/frr/py3.patch deleted file mode 100644 index cc9654adfc..0000000000 --- a/testing/frr/py3.patch +++ /dev/null @@ -1,1001 +0,0 @@ -diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py -index 239de55..3e7fc07 100755 ---- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py -+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_all_protocol_startup.py -diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.py b/tests/topotests/bfd-topo1/test_bfd_topo1.py -index 4fd4f97..192f44c 100644 ---- a/tests/topotests/bfd-topo1/test_bfd_topo1.py -+++ b/tests/topotests/bfd-topo1/test_bfd_topo1.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bfd_topo1.py -diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.py b/tests/topotests/bfd-topo2/test_bfd_topo2.py -index 773db12..140ceee 100644 ---- a/tests/topotests/bfd-topo2/test_bfd_topo2.py -+++ b/tests/topotests/bfd-topo2/test_bfd_topo2.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bfd_topo2.py -diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py -index 647c254..dd2e43c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py -+++ b/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py -index d806226..9e3167c 100755 ---- a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py -+++ b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bgp_ecmp_topo1.py -diff --git a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py b/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py -index b0d6040..695c15c 100755 ---- a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py -+++ b/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bgp.py -diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py -index b464905..e14cc8d 100644 ---- a/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py -+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py -index f710c84..3cc7a1f 100755 ---- a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py -+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py -index ce54241..7ad82e1 100644 ---- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py -+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py -index 1da1066..7c35892 100755 ---- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py -+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py b/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py -index da4b67b..b06515a 100644 ---- a/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py -+++ b/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # bgp_local_as_private_remove.py -diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py b/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py -index 69b8c7c..1955176 100644 ---- a/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py -+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # bgp_local_as_private_remove.py -diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py -+++ b/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py -index 2de2bce..797da15 100755 ---- a/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py -+++ b/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py -index 7607fe9..0030954 100755 ---- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py -+++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bgp_multiview_topo1.py -diff --git a/tests/topotests/bgp_rfapi_basic_sanity/customize.py b/tests/topotests/bgp_rfapi_basic_sanity/customize.py -index a125c65..c385fc3 100644 ---- a/tests/topotests/bgp_rfapi_basic_sanity/customize.py -+++ b/tests/topotests/bgp_rfapi_basic_sanity/customize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py -index 0e1f236..7ec7dbb 100755 ---- a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py -+++ b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # Part of NetDEF Topology Tests -diff --git a/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py b/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py -index 59ffd36..2628be9 100644 ---- a/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py -+++ b/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bgp_show_ip_bgp_fqdn.py -diff --git a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py b/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py -index 5334ea5..f310eee 100755 ---- a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py -+++ b/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-receive.py: Save received routes form ExaBGP into file -diff --git a/tests/topotests/bgp_vrf_netns/peer1/exa-send.py b/tests/topotests/bgp_vrf_netns/peer1/exa-send.py -index 9a2a201..5c2b5c1 100755 ---- a/tests/topotests/bgp_vrf_netns/peer1/exa-send.py -+++ b/tests/topotests/bgp_vrf_netns/peer1/exa-send.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - exa-send.py: Send a few testroutes with ExaBGP -diff --git a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py -index a5590bc..3c69dca 100755 ---- a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py -+++ b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_bgp_vrf_netns_topo1.py -diff --git a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py -index 1c00fac..adc1731 100755 ---- a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py -+++ b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # test_eigrp_topo1.py -diff --git a/tests/topotests/example-test/test_example.py b/tests/topotests/example-test/test_example.py -index 8e37ad1..9637eb3 100755 ---- a/tests/topotests/example-test/test_example.py -+++ b/tests/topotests/example-test/test_example.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import subprocess - import sys -diff --git a/tests/topotests/example-test/test_template.py b/tests/topotests/example-test/test_template.py -index 4e35ce8..6a0d298 100755 ---- a/tests/topotests/example-test/test_template.py -+++ b/tests/topotests/example-test/test_template.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - #