From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 5A5905A031F for ; Mon, 05 Aug 2024 14:37:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1722861425; bh=gZX52+x4FpF8ShY9Ld7lA26MFOFzrcwIhHDleKszCT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JRtxHs374NVmkQlB2xTReByD4DqraDQUhhtMynxkFBkBGiQBmjbgzLAaHDgjoSgXq DLmCAw3lQ9gfvodez2Qui37q32HdBKNbnfxHNPzkqGdnn4AO+ybSNCl/l9yOAtMYbW rTfrFccZ4uqwQmkyhXDD3FhCsWN6z/xJeGy7R/Oh6haQBdz5FUGn/GnaXQturir91M 7lCWx0bImvpDcoXsB3CsH3LZJHv7e4/Ebq5Pf/cvvTo1vL2RMuigWOcab8M8//ZWT+ +Xt1DR5+4jM4+hFKnWMoSVIHsYg31V02H8vb3kFm3qLrdd4s32RwqvL0KA/3BUtM+q Eg/Ax3EuNf1Ng== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4WcwtT2YqVz4x81; Mon, 5 Aug 2024 22:37:05 +1000 (AEST) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 13/22] tasst: Helper for creating veth devices between namespaces Date: Mon, 5 Aug 2024 22:36:52 +1000 Message-ID: <20240805123701.1720730-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805123701.1720730-1-david@gibson.dropbear.id.au> References: <20240805123701.1720730-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: SJJIMLQHHN5AH26DZ7AHXEIIIWHYNT4V X-Message-ID-Hash: SJJIMLQHHN5AH26DZ7AHXEIIIWHYNT4V 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 , 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: Signed-off-by: David Gibson --- 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 + +"""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 + +""" +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