public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
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 11/20] avocado/tasst: Helper for creating veth devices between namespaces
Date: Wed, 31 May 2023 11:58:40 +1000	[thread overview]
Message-ID: <20230531015849.3229596-12-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230531015849.3229596-1-david@gibson.dropbear.id.au>

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 avocado/tasst/meta/__init__.py | 16 +++++++++++++
 avocado/tasst/meta/veth.py     | 43 ++++++++++++++++++++++++++++++++++
 avocado/tasst/nstool.py        | 10 ++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 avocado/tasst/meta/__init__.py
 create mode 100644 avocado/tasst/meta/veth.py

diff --git a/avocado/tasst/meta/__init__.py b/avocado/tasst/meta/__init__.py
new file mode 100644
index 0000000..6582554
--- /dev/null
+++ b/avocado/tasst/meta/__init__.py
@@ -0,0 +1,16 @@
+#! /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/meta - Test pieces of the test infrastructure.
+#
+# Usually, tests for the test infrastructure should go next to the
+# implementation of the thing being tested.  Sometimes that's not
+# possible (usually because it would cause a circular module
+# dependency).  In that case those tests can go here.
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
diff --git a/avocado/tasst/meta/veth.py b/avocado/tasst/meta/veth.py
new file mode 100644
index 0000000..c4cdcf7
--- /dev/null
+++ b/avocado/tasst/meta/veth.py
@@ -0,0 +1,43 @@
+#! /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/metatest/veth - Test the veth creation helper
+#
+# These test code from tasst.site, but require additional support from
+# tasst.nstool.
+#
+# Copyright Red Hat
+# Author: David Gibson <david@gibson.dropbear.id.au>
+
+import contextlib
+
+import avocado
+
+from tasst import Tasst
+from tasst.site import REAL_HOST
+from tasst.nstool import UnshareSite
+
+
+class VethTasst(Tasst):
+    """
+    Test helpers for creating veths between namespaces
+
+    :avocado: tags=meta
+    """
+
+    @contextlib.contextmanager
+    def setup_veth(self):
+        with UnshareSite(type(self).__name__ + '.1', '-Un') as ns1:
+            with UnshareSite(type(self).__name__ + '.2', '-n',
+                             parent=ns1, sudo=True) as ns2:
+                ns1.veth('veth1', 'veth2', ns2)
+                yield (ns1, ns2)
+
+    def test_ifs(self):
+        with self.setup_veth() as (ns1, ns2):
+            self.assertCountEqual(ns1.ifs(), ['lo', 'veth1'])
+            self.assertCountEqual(ns2.ifs(), ['lo', 'veth2'])
diff --git a/avocado/tasst/nstool.py b/avocado/tasst/nstool.py
index 50598a5..6f1d96b 100644
--- a/avocado/tasst/nstool.py
+++ b/avocado/tasst/nstool.py
@@ -68,6 +68,16 @@ class NsToolSite(Site):
     def bg(self, cmd, sudo=False, **kwargs):
         return REAL_HOST.bg(self._nst_cmd(cmd, sudo), **kwargs)
 
+    def veth(self, ifname, peername, peer=None):
+        self.fg('ip link add {} type veth peer name {}'.format(ifname, peername),
+                sudo=True)
+        if peer is not None:
+            if not isinstance(peer, NsToolSite):
+                raise TypeError
+            self.fg('ip link set {} netns {}'.format(peername,
+                                                     peer.relative_pid(self)),
+                    sudo=True)
+
 
 # Create path for temporary nstool Unix socket
 #
-- 
@@ -68,6 +68,16 @@ class NsToolSite(Site):
     def bg(self, cmd, sudo=False, **kwargs):
         return REAL_HOST.bg(self._nst_cmd(cmd, sudo), **kwargs)
 
+    def veth(self, ifname, peername, peer=None):
+        self.fg('ip link add {} type veth peer name {}'.format(ifname, peername),
+                sudo=True)
+        if peer is not None:
+            if not isinstance(peer, NsToolSite):
+                raise TypeError
+            self.fg('ip link set {} netns {}'.format(peername,
+                                                     peer.relative_pid(self)),
+                    sudo=True)
+
 
 # Create path for temporary nstool Unix socket
 #
-- 
2.40.1


  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 ` David Gibson [this message]
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 ` [PATCH v3 16/20] avocado/tasst: IP address allocation helpers David Gibson
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-12-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).