[PATCH v2 13/22] tasst: Helper for creating veth devices between namespaces

[David Gibson <david@gibson.dropbear.id.au>]

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 test/Makefile                   |  3 ++-
 test/tasst/__main__.py          |  1 +
 test/tasst/nstool.py            |  9 +++++++++
 test/tasst/selftest/__init__.py | 16 ++++++++++++++++
 test/tasst/selftest/veth.py     | 33 +++++++++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 test/tasst/selftest/__init__.py
 create mode 100644 test/tasst/selftest/veth.py

diff --git a/test/Makefile b/test/Makefile
index 83725f59..e13c49c8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -72,7 +72,8 @@ EXETER_PY = build/build.py
 EXETER_JOBS = $(EXETER_SH:%.sh=%.json) $(EXETER_PY:%.py=%.json)
 AVOCADO_JOBS = $(EXETER_JOBS) avocado/static_checkers.json
 
-TASST_SRCS = __init__.py __main__.py nstool.py snh.py
+TASST_SRCS = __init__.py __main__.py nstool.py snh.py \
+	selftest/__init__.py selftest/veth.py
 
 EXETER_META = meta/lint.json meta/tasst.json
 META_JOBS = $(EXETER_META)
diff --git a/test/tasst/__main__.py b/test/tasst/__main__.py
index 9fd6174e..d52f9c55 100644
--- a/test/tasst/__main__.py
+++ b/test/tasst/__main__.py
@@ -14,6 +14,7 @@ import exeter
 
 # We import just to get the exeter tests, which flake8 can't see
 from . import nstool, snh  # noqa: F401
+from .selftest import veth  # noqa: F401
 
 
 if __name__ == '__main__':
diff --git a/test/tasst/nstool.py b/test/tasst/nstool.py
index d852d81e..bf0174eb 100644
--- a/test/tasst/nstool.py
+++ b/test/tasst/nstool.py
@@ -68,6 +68,15 @@ class NsTool(SimNetHost):
         hostcmd += list(cmd)
         return hostcmd, kwargs
 
+    def veth(self, ifname, peername, peer=None):
+        self.fg('ip', 'link', 'add', f'{ifname}', 'type', 'veth',
+                'peer', 'name', f'{peername}', capable=True)
+        if peer is not None:
+            if not isinstance(peer, NsTool):
+                raise TypeError
+            self.fg('ip', 'link', 'set', f'{peername}',
+                    'netns', f'{peer.relative_pid(self)}', capable=True)
+
 
 @contextlib.contextmanager
 def unshare_snh(name, *opts, parent=RealHost(), capable=False):
diff --git a/test/tasst/selftest/__init__.py b/test/tasst/selftest/__init__.py
new file mode 100644
index 00000000..d7742930
--- /dev/null
+++ b/test/tasst/selftest/__init__.py
@@ -0,0 +1,16 @@
+#! /usr/bin/python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""Test A Simple Socket Transport
+
+selftest/ - Selftests for the tasst library
+
+Usually, tests for the tasst helper library itself should go next to
+the implementation of the thing being tested.  Sometimes that's
+inconvenient or impossible (usually because it would cause a circular
+module dependency).  In that case those tests can go here.
+"""
diff --git a/test/tasst/selftest/veth.py b/test/tasst/selftest/veth.py
new file mode 100644
index 00000000..3c0b3f5b
--- /dev/null
+++ b/test/tasst/selftest/veth.py
@@ -0,0 +1,33 @@
+#! /usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""
+Test A Simple Socket Transport
+
+selftest/veth.py - Test various veth configurations
+"""
+
+import contextlib
+
+import exeter
+
+from tasst import nstool
+
+
+@contextlib.contextmanager
+def unconfigured_veth():
+    with nstool.unshare_snh('ns1', '-Un') as ns1:
+        with nstool.unshare_snh('ns2', '-n', parent=ns1, capable=True) as ns2:
+            ns1.veth('veth1', 'veth2', ns2)
+            yield (ns1, ns2)
+
+
+@exeter.test
+def test_ifs():
+    with unconfigured_veth() as (ns1, ns2):
+        exeter.assert_eq(set(ns1.ifs()), set(['lo', 'veth1']))
+        exeter.assert_eq(set(ns2.ifs()), set(['lo', 'veth2']))
-- 
@@ -0,0 +1,33 @@
+#! /usr/bin/env python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+"""
+Test A Simple Socket Transport
+
+selftest/veth.py - Test various veth configurations
+"""
+
+import contextlib
+
+import exeter
+
+from tasst import nstool
+
+
+@contextlib.contextmanager
+def unconfigured_veth():
+    with nstool.unshare_snh('ns1', '-Un') as ns1:
+        with nstool.unshare_snh('ns2', '-n', parent=ns1, capable=True) as ns2:
+            ns1.veth('veth1', 'veth2', ns2)
+            yield (ns1, ns2)
+
+
+@exeter.test
+def test_ifs():
+    with unconfigured_veth() as (ns1, ns2):
+        exeter.assert_eq(set(ns1.ifs()), set(['lo', 'veth1']))
+        exeter.assert_eq(set(ns2.ifs()), set(['lo', 'veth2']))
-- 
2.45.2