[PATCH v2 17/21] avocado/tasst: IP address allocation helpers

[David Gibson <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 | 40 ++++++++++++++---
 avocado/tasst/transfer.py  |  1 +
 3 files changed, 124 insertions(+), 6 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 362252b..8122d0e 100644
--- a/avocado/tasst/meta/veth.py
+++ b/avocado/tasst/meta/veth.py
@@ -20,14 +20,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
+from tasst.address import IpiAllocator
 
 
-class VethTasst(Tasst):
-    """
-    Test helpers for creating veths between namespaces
-
-    :avocado: tags=meta
-    """
+class BaseVethTasst(Tasst):
     def setUp(self):
         super().setUp()
         self.ns1 = UnshareSite(type(self).__name__ + '.1', '-Un')
@@ -40,6 +37,13 @@ class VethTasst(Tasst):
         self.ns1.close()
         super().tearDown()
 
+
+class VethTasst(BaseVethTasst):
+    """
+    Test helpers for creating veths between namespaces
+
+    :avocado: tags=meta
+    """
     def test_ifs(self):
         self.assertCountEqual(self.ns1.ifs(), ['lo', 'veth1'])
         self.assertCountEqual(self.ns2.ifs(), ['lo', 'veth2'])
@@ -65,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
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        ipa = IpiAllocator()
+
+        ns1_ip4, ns1_ip6 = ipa.next_ipis()
+        self.ns1.ifup('lo')
+        self.ns1.ifup('veth1', ns1_ip4, ns1_ip6, dad='disable')
+
+        ns2_ip4, ns2_ip6 = ipa.next_ipis()
+        self.ns2.ifup('lo')
+        self.ns2.ifup('veth2', ns2_ip4, ns2_ip6, dad='disable')
+
+        BaseTransferTasst.subsetup(self, 'test/small.bin', self.ns1, self.ns2,
+                                   ns2_ip4.ip, ns2_ip6.ip, 10000)
diff --git a/avocado/tasst/transfer.py b/avocado/tasst/transfer.py
index e891012..0f8d9d1 100644
--- a/avocado/tasst/transfer.py
+++ b/avocado/tasst/transfer.py
@@ -16,6 +16,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
 
-- 
@@ -16,6 +16,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
 
-- 
2.40.1