From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: Cleber Rosa <crosa@redhat.com>,
jarichte@redhat.com, David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v3 16/20] avocado/tasst: IP address allocation helpers
Date: Wed, 31 May 2023 11:58:45 +1000 [thread overview]
Message-ID: <20230531015849.3229596-17-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230531015849.3229596-1-david@gibson.dropbear.id.au>
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 <david@gibson.dropbear.id.au>
---
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 <david@gibson.dropbear.id.au>
+
+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
--
@@ -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
next prev parent reply other threads:[~2023-05-31 1:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 1:58 [PATCH v3 00/20] RFCv3: Proof-of-concept conversion of some tests to Avocado framework David Gibson
2023-05-30 23:59 ` [PATCH v3 01/20] avocado: Make a duplicate copy of testsuite for comparison purposes David Gibson
2023-05-31 1:58 ` [PATCH v3 02/20] avocado: Don't double download assets for test/ and oldtest/ David Gibson
2023-05-31 1:58 ` [PATCH v3 03/20] avocado: Move static checkers to avocado David Gibson
2023-05-31 1:58 ` [PATCH v3 04/20] avocado/tasst: Helper functions for executing commands in different places David Gibson
2023-05-31 1:58 ` [PATCH v3 05/20] avocado/tasst: Type checking helpers David Gibson
2023-05-31 1:58 ` [PATCH v3 06/20] avocado: Convert build tests to avocado David Gibson
2023-05-31 1:58 ` [PATCH v3 07/20] avocado/tasst: Add helpers for running background commands on sites David Gibson
2023-05-31 1:58 ` [PATCH v3 08/20] avocado/tasst: Add helper to get network interface names for a site David Gibson
2023-05-31 1:58 ` [PATCH v3 09/20] avocado/tasst: Add helpers to run commands with nstool David Gibson
2023-05-31 1:58 ` [PATCH v3 10/20] avocado/tasst: Add ifup and network address helpers to Site David Gibson
2023-05-31 1:58 ` [PATCH v3 11/20] avocado/tasst: Helper for creating veth devices between namespaces David Gibson
2023-05-31 1:58 ` [PATCH v3 12/20] avocado/tasst: Add helper for getting MTU of a network interface David Gibson
2023-05-31 1:58 ` [PATCH v3 13/20] avocado/tasst: Add helper to wait for IP address to appear David Gibson
2023-05-31 1:58 ` [PATCH v3 14/20] avocado/tasst: Add helpers for getting a site's routes David Gibson
2023-05-31 1:58 ` [PATCH v3 15/20] avocado/tasst: Helpers for test transferring data between sites David Gibson
2023-05-31 1:58 ` David Gibson [this message]
2023-05-31 1:58 ` [PATCH v3 17/20] avocado/tasst: Helpers for testing NDP behaviour David Gibson
2023-05-31 1:58 ` [PATCH v3 18/20] avocado/tasst: Helpers for testing DHCP & DHCPv6 behaviour David Gibson
2023-05-31 1:58 ` [PATCH v3 19/20] avocado/tasst: Helpers to construct a simple network environment for tests David Gibson
2023-05-31 1:58 ` [PATCH v3 20/20] avocado: Convert basic pasta tests David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531015849.3229596-17-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=crosa@redhat.com \
--cc=jarichte@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).