From nobody Sun May 5 20:46:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579098264; cv=none; d=zohomail.com; s=zohoarc; b=UcJkvt++akIqJWMTITjASRZtDjKS+0o9C9tAZ62sI9+nilKt/A4YUEX2ZldsNFAJbbk4uu4B9Qah9y8JtgAkRaZwo8e5fq51iGSKAVJ33oFbElafkh9ZBisPj6y0h4IteZqKXw7sFqBNJP8UPvKpWqF1W3e2U4Uh2hGxpev96/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579098264; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9V15ftlaDEUewlarDqJr+RpxSaipQQocNQCxvj52UPU=; b=PhQX5liKbDTnE37McpWlr9EudIlXIsbbWda8KXybNjg7Juzz/iSXy/w7zsK6LOOuzMloolJRU/m1gmSzC9+rWDa9O+yLiuAvAJsOWnoluDaOaBwKK8JSK4RgCYyzh9uU+k3LrPkPulmiybu5MSlqrt8b/r/F/uzCjkKb67TqZDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1579098264134947.5779066387744; Wed, 15 Jan 2020 06:24:24 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-_CcpEJd8OmmmBf_rp9AY6Q-1; Wed, 15 Jan 2020 09:24:20 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2504B1902EBF; Wed, 15 Jan 2020 14:24:15 +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 DF9FE89D11; Wed, 15 Jan 2020 14:24:13 +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 7062718089C8; Wed, 15 Jan 2020 14:24:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00FEOAw0007727 for ; Wed, 15 Jan 2020 09:24:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id BC6525F700; Wed, 15 Jan 2020 14:24:10 +0000 (UTC) Received: from ridgehead.redhat.com (unknown [10.43.2.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09D445C557; Wed, 15 Jan 2020 14:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579098263; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9V15ftlaDEUewlarDqJr+RpxSaipQQocNQCxvj52UPU=; b=ZNx2uZ4otHIPa4m2u5xNTx9zoBkZxnvqvJO7tRloMk1rnxu4rXCsLqxM8hRGE8eWerOWWD lM/+IdAduab2vQnBK+qWxxKSJ07Uka/GfWvcIzp1aAb329INZuuu9bX4s85Ul+C7FviZ5O G4fmV99BYvdVtLePxyBqzeTQpGdV1sM= From: Erik Skultety To: libvir-list@redhat.com Date: Wed, 15 Jan 2020 15:23:58 +0100 Message-Id: <6c9dec6b6f1e4434bedd386378b1ea0b035a34b6.1579098197.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [tck PATCH 1/3] network: Fix the iptables FORWARD chain name being queried 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: _CcpEJd8OmmmBf_rp9AY6Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" libvirt's has been defining private chains within iptables for a while, only putting a target labels inside the master FORWARD chain which broke the networking test suite which wasn't adjusted accordingly. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- .../networks/networkxml2hostout/tck-testnet-1.dat | 3 ++- .../networks/networkxml2hostout/tck-testnet-2.dat | 3 ++- .../networks/networkxml2hostout/tck-testnet-3.dat | 12 +++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/script= s/networks/networkxml2hostout/tck-testnet-1.dat index 3e2ce12..eacd4c4 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -4,8 +4,9 @@ RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: = 1024-65535=20 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: = 1024-65535=20 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 =20 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' +#iptables -n -L LIBVIRT_FWI | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state= /' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED= ,ESTABLISHED=20 +#iptables -n -L LIBVIRT_FWO | grep ' 10\.1\.2\.' ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 =20 #ip -o route show dev tck-testbr | gawk '{print $1" "$7}' 10.1.2.0/24 10.1.2.1 diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/script= s/networks/networkxml2hostout/tck-testnet-2.dat index 48b4b28..9c90348 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -1,5 +1,6 @@ -#iptables -L FORWARD -n | grep ' 10\.1\.2\.' +#iptables -L LIBVIRT_FWI -n | grep ' 10\.1\.2\.' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 =20 +#iptables -L LIBVIRT_FWO -n | grep ' 10\.1\.2\.' ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 =20 #iptables -t nat -L -n | grep ' 10\.1\.2\.' #ip -o route show dev tck-testbr | gawk '{print $1" "$7}' diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/script= s/networks/networkxml2hostout/tck-testnet-3.dat index fca4f81..77664ba 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -4,14 +4,16 @@ RETURN all -- 10.1.2.0/24 255.255.255.255 MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: = 1024-65535=20 MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: = 1024-65535=20 MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 =20 -#iptables -n -L FORWARD | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state/' +#iptables -n -L LIBVIRT_FWI | grep ' 10\.1\.2\.' | sed -e 's/ctstate/state= /' ACCEPT all -- 0.0.0.0/0 10.1.2.0/24 state RELATED= ,ESTABLISHED=20 -ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 =20 -#ip6tables -n -L FORWARD | grep ' 2001:db8:ac10' +#iptables -n -L LIBVIRT_FWO | grep ' 10\.1\.2\.' +ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 +#ip6tables -n -L LIBVIRT_FWI | grep ' 2001:db8:ac10' ACCEPT all ::/0 2001:db8:ac10:fd01::/64=20 -ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 =20 ACCEPT all ::/0 2001:db8:ac10:fe01::/64=20 -ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 =20 +#ip6tables -n -L LIBVIRT_FWO | grep ' 2001:db8:ac10' +ACCEPT all 2001:db8:ac10:fd01::/64 ::/0 +ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*\(\/dnsmasq\/tck-testnet.con= f\).*|\1|p' | head -1 /dnsmasq/tck-testnet.conf #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 20:46:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579098265; cv=none; d=zohomail.com; s=zohoarc; b=VuompsHQI//ahS/bgeamaBl2jGhoEhS9+TRMVtuts7jGvzUdgDm7sQfK+ElJM87au03wQmdcbzAN9EeuNP478bs6ggSR5xCK7HAxgKe4y/WfiDy4MNXsQu6pXrXh8azLIDlpwScAzAW755WMkItmMuJ+tfBAkPjPG2SyYrxBUXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579098265; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DHYt40c0PsdpR2gyW+Qnen/mSyuwhsjlwG52Z0bMOz8=; b=SKbgQ/5s6ldjHuYFoiCvNMQy++ZQc8z8zuUlxwGKtv7k9ZCtc5oY+YBwW9/FkRHyMoSRkeYmX02ylTkj8CqkUeP3Oi3nZQ7gcg0UXwnvs/mtCSiNz3USwHNOaA9V3v1SjgwLgDo/fMfj6+w1WAht6g/PE/+1JfG7jgdOaB1o5g8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1579098265562421.1025737514767; Wed, 15 Jan 2020 06:24:25 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-__9VUsTPNTGt57lNdb1s4w-1; Wed, 15 Jan 2020 09:24:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5F5519057C2; Wed, 15 Jan 2020 14:24:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7483A5DA7E; Wed, 15 Jan 2020 14:24:16 +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 D35898250D; Wed, 15 Jan 2020 14:24:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00FEODTn007740 for ; Wed, 15 Jan 2020 09:24:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 652BA1E6; Wed, 15 Jan 2020 14:24:13 +0000 (UTC) Received: from ridgehead.redhat.com (unknown [10.43.2.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6A895C557; Wed, 15 Jan 2020 14:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579098264; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DHYt40c0PsdpR2gyW+Qnen/mSyuwhsjlwG52Z0bMOz8=; b=hhT78h3c0xlgsEeK7q3mj5IaQLh0rmoYvUTtnHhJEJft0TtgYpnAtxz0ZX+SyESnxNNjiw y1Efj9ndqkkp2ZcOuIwzYx0oWzTwiLLXsUOODaPRXTnH5V1iUM/z3aAzxDz5Op+tiQuB5x LfIdjY45ZsJ1WaDIkMMgDyzqajyWsZY= From: Erik Skultety To: libvir-list@redhat.com Date: Wed, 15 Jan 2020 15:23:59 +0100 Message-Id: <2069f72fde24cd2a4952187716a20df1982b4406.1579098197.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [tck PATCH 2/3] network: Fix the dhcp range output being matched 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: __9VUsTPNTGt57lNdb1s4w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since libvirt commit 82fe58ff libvirt has been formatting the network mask to the dnsmasq's dhcp-range config option which broke a few of the networking tests. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/script= s/networks/networkxml2hostout/tck-testnet-1.dat index eacd4c4..cf6f150 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -15,7 +15,7 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` 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 +dhcp-range=3D10.1.2.2,10.1.2.254,255.255.255.0 #ip link show type bridge | grep tck-testbr | gawk '{print $2}' tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/script= s/networks/networkxml2hostout/tck-testnet-2.dat index 9c90348..aabd959 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -10,7 +10,7 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` 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 +dhcp-range=3D10.1.2.2,10.1.2.254,255.255.255.0 #ip link show type bridge | grep tck-testbr | gawk '{print $2}' tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/script= s/networks/networkxml2hostout/tck-testnet-3.dat index 77664ba..cb3dd18 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -19,7 +19,7 @@ ACCEPT all 2001:db8:ac10:fe01::/64 ::/0 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-= file=3D\(.*tck-testnet.conf\).*|\1|p'` 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 +dhcp-range=3D10.1.2.2,10.1.2.254,255.255.255.0 dhcp-range=3D2001:db8:ac10:fe01::1,ra-only dhcp-range=3D2001:db8:ac10:fd01::1,ra-only #ip link show type bridge | grep tck-testbr | gawk '{print $2}' --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 20:46:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579098283; cv=none; d=zohomail.com; s=zohoarc; b=g9pSODoCYNNxbX7Z03xUv+5zmNHB4rbbck6iL6EGbTidKims2lermSoNzgJEY+d3wi1075GWRxb7FDD0Yq10HcvEuzZsA3crrcZTavkJqsSq0cG/iaKgAYuSRSTYhi5xuqt9JHdkyUY059HFVWdb9DNPEv7FI/cY4c78VvIUApI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579098283; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sBXaRHdNzEVN7q3VAtCkhpkvB/1IV25ZRpEoF1izNbs=; b=DQRxSzAiHJ5pJYOgssfOImaCyM4HKv5BzOgGkxRNRkKlsGLK9pGyLe43peK3yIWNSes1naAFtI/vWjgngDyiTfuw8IrqWRjCZr9xysSrkYxEsO/nDv81s/k9/AcTvogfzlWhdZkhyc3d+YBYZoNTXzjGt6xDnq/1OUcnz9+u7ww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1579098283204542.9292006425721; Wed, 15 Jan 2020 06:24:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-FcKMM9jgMZmke8i3D2gMqg-1; Wed, 15 Jan 2020 09:24:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03402108BCDA; Wed, 15 Jan 2020 14:24:33 +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 D615989D00; Wed, 15 Jan 2020 14:24:32 +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 97D8618089D0; Wed, 15 Jan 2020 14:24:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00FEOHgD007758 for ; Wed, 15 Jan 2020 09:24:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 90D715C21B; Wed, 15 Jan 2020 14:24:17 +0000 (UTC) Received: from ridgehead.redhat.com (unknown [10.43.2.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F7DB5090C; Wed, 15 Jan 2020 14:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579098282; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sBXaRHdNzEVN7q3VAtCkhpkvB/1IV25ZRpEoF1izNbs=; b=XVInEHaCAOxZpUTbGgmnVWaVdogBPLSeKV80X9Zhz6hDxEzyJdOZwmDqm8P3nLol4sTgiN lZyCGKMbUw9Omg+En9Bvo5o1zA1Ry5xmB6XYrB2a+mGjWeeltv40JBfIIpabzpmhEsaz8a qFPs09uniSD37YSCCrHaQmhHxCLDs+8= From: Erik Skultety To: libvir-list@redhat.com Date: Wed, 15 Jan 2020 15:24:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [tck PATCH 3/3] nwfilter: Fix the expected output from ebtables 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: FcKMM9jgMZmke8i3D2gMqg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" For some reason, some of the PTP link addresses didn't specify the /128 prefix explicitly which fails the pattern matching in the nwfilter tests. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- .../nwfilter/nwfilterxml2fwallout/ipv6-test.fwall | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/nwfilter/nwfilterxml2fwallout/ipv6-test.fwall b/script= s/nwfilter/nwfilterxml2fwallout/ipv6-test.fwall index 5803759..0e26b6c 100644 --- a/scripts/nwfilter/nwfilterxml2fwallout/ipv6-test.fwall +++ b/scripts/nwfilter/nwfilterxml2fwallout/ipv6-test.fwall @@ -4,10 +4,10 @@ -o vnet0 -j libvirt-O-vnet0 #ebtables -t nat -L libvirt-I-vnet0 | sed 's#/ffff:ffff:ffff:ffff:ffff:fff= f:ffff:ffff##g' | sed 's#/ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000#/113#g' |= sed 's#/ffff:ffff:ffff:ffff:8000::#/65#g' | sed 's#/ffff:fc00::#/22#g' | s= ed s/01:02:03:04:05:06/1:2:3:4:5:6/g | grep -v "^Bridge" | grep -v "^$" -p IPv6 -s 1:2:3:4:5:6/ff:ff:ff:ff:ff:fe -d aa:bb:cc:dd:ee:80/ff:ff:ff:ff:= ff:80 --ip6-src ::/22 --ip6-dst ::10.1.0.0/113 --ip6-proto udp --ip6-sport = 20:22 --ip6-dport 100:101 -j ACCEPT --p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2 --ip6-proto tcp --ip6-sport 10= 0:101 --ip6-dport 20:22 -j ACCEPT --p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2 --ip6-proto tcp --ip6-sport 65= 535 --ip6-dport 255:256 -j ACCEPT --p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2 --ip6-proto mux -j ACCEPT +-p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2/128 --ip6-proto tcp --ip6-spor= t 100:101 --ip6-dport 20:22 -j ACCEPT +-p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2/128 --ip6-proto tcp --ip6-spor= t 65535 --ip6-dport 255:256 -j ACCEPT +-p IPv6 --ip6-src a:b:c::/65 --ip6-dst 1::2/128 --ip6-proto mux -j ACCEPT #ebtables -t nat -L libvirt-O-vnet0 | sed 's#/ffff:ffff:ffff:ffff:ffff:fff= f:ffff:ffff##g' | sed 's#/ffff:ffff:ffff:ffff:8000::#/65#g' | grep -v "^Bri= dge" | grep -v "^$" --p IPv6 --ip6-src 1::2 --ip6-dst a:b:c::/65 --ip6-proto tcp --ip6-sport 20= :22 --ip6-dport 100:101 -j ACCEPT --p IPv6 --ip6-src 1::2 --ip6-dst a:b:c::/65 --ip6-proto tcp --ip6-sport 25= 5:256 --ip6-dport 65535 -j ACCEPT --p IPv6 --ip6-src 1::2 --ip6-dst a:b:c::/65 --ip6-proto mux -j ACCEPT +-p IPv6 --ip6-src 1::2/128 --ip6-dst a:b:c::/65 --ip6-proto tcp --ip6-spor= t 20:22 --ip6-dport 100:101 -j ACCEPT +-p IPv6 --ip6-src 1::2/128 --ip6-dst a:b:c::/65 --ip6-proto tcp --ip6-spor= t 255:256 --ip6-dport 65535 -j ACCEPT +-p IPv6 --ip6-src 1::2/128 --ip6-dst a:b:c::/65 --ip6-proto mux -j ACCEPT --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list