From nobody Wed Nov 27 19:33:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536865915865270.2193216212348; Thu, 13 Sep 2018 12:11:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70DC5C0587FE; Thu, 13 Sep 2018 19:11:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63EC630912F4; Thu, 13 Sep 2018 19:11:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 210C418005DF; Thu, 13 Sep 2018 19:11:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8DJBm5r015398 for ; Thu, 13 Sep 2018 15:11:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 782715D9CA; Thu, 13 Sep 2018 19:11:48 +0000 (UTC) Received: from rhel8.laine.org (ovpn-117-58.phx2.redhat.com [10.3.117.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 373E45D9CB for ; Thu, 13 Sep 2018 19:11:44 +0000 (UTC) From: Laine Stump To: libvir-list@redhat.com Date: Thu, 13 Sep 2018 15:11:42 -0400 Message-Id: <20180913191142.18540-1-laine@laine.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH] eliminate use of deprecated brctl in network tests X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 13 Sep 2018 19:11:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" brctl is part of the bridge-utils package, which has been deprecated / replaced by the "ip" and "bridge" commands in the iproute package in all modern distros. This patch removes the few usages of brctl in libvirt-tck's network tests, replacing it with a functional equivalent that uses "ip link show type bridge" instead. Signed-off-by: Laine Stump Reviewed-by: John Ferlan --- scripts/networks/networkxml2hostout/tck-testnet-1.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/script= s/networks/networkxml2hostout/tck-testnet-1.dat index 59cda2f..3e2ce12 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -15,8 +15,8 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 bind-dynamic #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-fi= le=3D\(.*tck-testnet.conf\).*|\1|p'` dhcp-range=3D10.1.2.2,10.1.2.254 -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' 10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat b/s= cripts/networks/networkxml2hostout/tck-testnet-1.post.dat index 48e1d5a..30f981a 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat @@ -4,6 +4,6 @@ #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range 10\.1\.2\.2\,10= \.1\.2\.254*\).*|\1|p' #route -n | grep '10\.1\.2\.' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null| grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/script= s/networks/networkxml2hostout/tck-testnet-2.dat index 4f3d135..48b4b28 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -10,8 +10,8 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 bind-dynamic #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-fi= le=3D\(.*tck-testnet.conf\).*|\1|p'` dhcp-range=3D10.1.2.2,10.1.2.254 -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' 10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat b/s= cripts/networks/networkxml2hostout/tck-testnet-2.post.dat index a8e0f60..a80f663 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat @@ -3,6 +3,6 @@ #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(listen-address 10\.1\.2\.1= \).*|\1|p' #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(dhcp-range 10\.1\.2\.2,10\= .1\.2\.254\).*|\1|p' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/script= s/networks/networkxml2hostout/tck-testnet-3.dat index 5c61690..fca4f81 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -20,8 +20,8 @@ bind-dynamic dhcp-range=3D10.1.2.2,10.1.2.254 dhcp-range=3D2001:db8:ac10:fe01::1,ra-only dhcp-range=3D2001:db8:ac10:fd01::1,ra-only -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' | grep -v link 10.1.2.1/24 10.1.2.255 192.168.97.1/24 192.168.97.255 diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat b/s= cripts/networks/networkxml2hostout/tck-testnet-3.post.dat index e525e72..2bebd61 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat @@ -11,7 +11,7 @@ #route -n | grep '10\.1\.2\.' #route -n | grep '192\.168\.97\.' #route -n | grep '172\.28\.255\.240' -#brctl show | grep tck-testbr +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' #ifconfig tck-testbr 2>/dev/null | grep 'inet6 addr: 2001' #ip addr show tck-testbr 2>/dev/null | grep "inet " --=20 2.18.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list