From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id F11D85A026D for ; Wed, 31 May 2023 03:59:03 +0200 (CEST) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4QWC9S3xTBz4x5W; Wed, 31 May 2023 11:58:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1685498332; bh=m05z2u3MRCO1YpLysXslzUfUHDLrqBy8vOJshFb2ms0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LUrwSsRUaJL3xOJQd7ALRfARCkGviR4BzqG7ZrUM3W4u9AuY67FfDo3dBZi5MJRGz Or+rtZlTpKb2XS/I/VsCYIASfwcu1w22/HEcRqyrcrqiZFEEUWKDHjlyH1nL8OOXhy f2iuBFas248jg2fBEa6ua1D2XYX5PbxVf3fA3BaY= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 16/20] avocado/tasst: IP address allocation helpers Date: Wed, 31 May 2023 11:58:45 +1000 Message-Id: <20230531015849.3229596-17-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531015849.3229596-1-david@gibson.dropbear.id.au> References: <20230531015849.3229596-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NWQSBVISN722IPAN735I2BZH5BW36PFO X-Message-ID-Hash: NWQSBVISN722IPAN735I2BZH5BW36PFO X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Cleber Rosa , jarichte@redhat.com, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: A bunch of our test scenarious will require us to allocate IPv4 and IPv6 addresses in example networks. Make helpers to do this easily. Signed-off-by: David Gibson --- avocado/tasst/address.py | 89 ++++++++++++++++++++++++++++++++++++++ avocado/tasst/meta/veth.py | 41 +++++++++++++++--- avocado/tasst/transfer.py | 1 + 3 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 avocado/tasst/address.py diff --git a/avocado/tasst/address.py b/avocado/tasst/address.py new file mode 100644 index 0000000..6a6e025 --- /dev/null +++ b/avocado/tasst/address.py @@ -0,0 +1,89 @@ +#! /usr/bin/python3 + +# SPDX-License-Identifier: GPL-2.0-or-later +# +# tasst - Test A Simple Socket Transport +# library of test helpers for passt & pasta +# +# tasst/address.py - Address allocation helpers +# +# Copyright Red Hat +# Author: David Gibson + +import ipaddress + +import avocado + +from tasst import Tasst + + +# Loopback addresses, for convenience +LOOPBACK4 = ipaddress.ip_address('127.0.0.1') +LOOPBACK6 = ipaddress.ip_address('::1') + +# Documentation test networks defined by RFC 5737 +TEST_NET_1 = ipaddress.ip_network('192.0.2.0/24') +TEST_NET_2 = ipaddress.ip_network('198.51.100.0/24') +TEST_NET_3 = ipaddress.ip_network('203.0.113.0/24') + +# Documentation test network defined by RFC 3849 +TEST_NET6 = ipaddress.ip_network('2001:db8::/32') +# Some subnets of that for our usage +TEST_NET6_TASST_A = ipaddress.ip_network('2001:db8:9a55:aaaa::/64') +TEST_NET6_TASST_B = ipaddress.ip_network('2001:db8:9a55:bbbb::/64') +TEST_NET6_TASST_C = ipaddress.ip_network('2001:db8:9a55:cccc::/64') + + +class IpiAllocator: + DEFAULT_NETS = [TEST_NET_1, TEST_NET6_TASST_A] + + def __init__(self, *nets): + if not nets: + nets = self.DEFAULT_NETS + + self.nets = [ipaddress.ip_network(n) for n in nets] + self.hostses = [n.hosts() for n in self.nets] + + def next_ipis(self): + addrs = [next(h) for h in self.hostses] + return [ipaddress.ip_interface('{}/{}'.format(a, n.prefixlen)) + for a, n in zip(addrs, self.nets)] + + +class IpiAllocatorTasst(Tasst): + """ + :avocado: tags=meta + """ + + COUNT = 12 # Allocate this many addresses + NETS = None # From these networks (None means use default) + + def test(self): + if self.NETS is not None: + ipa = IpiAllocator(*self.NETS) + nets = self.NETS + else: + ipa = IpiAllocator() + nets = IpiAllocator.DEFAULT_NETS + + addrsets = [set() for i in range(len(nets))] + for i in range(self.COUNT): + addrs = ipa.next_ipis() + # Check we got as many addresses as expected + self.assertEquals(len(addrs), len(nets)) + for s, a, n in zip(addrsets, addrs, nets): + # Check the addresses belong to the right network + self.assertEquals(a.network, ipaddress.ip_network(n)) + s.add(a) + + print(addrsets) + # Check the addresses are unique + for s in addrsets: + self.assertEquals(len(s), self.COUNT) + +class IpiAllocatorCustomTasst(IpiAllocatorTasst): + """ + :avocado: tags=meta + """ + + NETS = ['10.55.0.0/16', '192.168.55.0/24', 'fd00:9a57:a000::/48'] diff --git a/avocado/tasst/meta/veth.py b/avocado/tasst/meta/veth.py index 4dfb15a..b886bfe 100644 --- a/avocado/tasst/meta/veth.py +++ b/avocado/tasst/meta/veth.py @@ -21,15 +21,11 @@ import avocado from tasst import Tasst from tasst.site import REAL_HOST from tasst.nstool import UnshareSite +from tasst.transfer import BaseTransferTasst, MetaTcpUploadTasst, MetaUdpTransferTasst, TransferTasstInfo +from tasst.address import IpiAllocator -class VethTasst(Tasst): - """ - Test helpers for creating veths between namespaces - - :avocado: tags=meta - """ - +class BaseVethTasst(Tasst): @contextlib.contextmanager def setup_veth(self): with UnshareSite(type(self).__name__ + '.1', '-Un') as ns1: @@ -38,6 +34,13 @@ class VethTasst(Tasst): ns1.veth('veth1', 'veth2', ns2) yield (ns1, ns2) + +class VethTasst(BaseVethTasst): + """ + Test helpers for creating veths between namespaces + + :avocado: tags=meta + """ def test_ifs(self): with self.setup_veth() as (ns1, ns2): self.assertCountEqual(ns1.ifs(), ['lo', 'veth1']) @@ -66,3 +69,27 @@ class VethTasst(Tasst): def test_no_dad(self): self.test_slaac(dad='disable') + + +class VethTransferTasst(BaseVethTasst, MetaTcpUploadTasst, MetaUdpTransferTasst): + """ + Test basic transfers over veth + + :avocado: tags=meta + """ + + @contextlib.contextmanager + def setup_transfer(self): + with self.setup_veth() as (ns1, ns2): + ipa = IpiAllocator() + + ns1_ip4, ns1_ip6 = ipa.next_ipis() + ns1.ifup('lo') + ns1.ifup('veth1', ns1_ip4, ns1_ip6, dad='disable') + + ns2_ip4, ns2_ip6 = ipa.next_ipis() + ns2.ifup('lo') + ns2.ifup('veth2', ns2_ip4, ns2_ip6, dad='disable') + + yield TransferTasstInfo('test/small.bin', ns1, ns2, + ns2_ip4.ip, ns2_ip6.ip, 10000) diff --git a/avocado/tasst/transfer.py b/avocado/tasst/transfer.py index 576219e..c9bffb1 100644 --- a/avocado/tasst/transfer.py +++ b/avocado/tasst/transfer.py @@ -17,6 +17,7 @@ import time import avocado from tasst import Tasst, TasstSubData +from tasst.address import LOOPBACK4, LOOPBACK6 from tasst.site import Site from tasst.nstool import UnshareSite from tasst.typing import typecheck, typecheck_default -- 2.40.1