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 10/20] avocado/tasst: Add ifup and network address helpers to Site
Date: Wed, 31 May 2023 11:58:39 +1000 [thread overview]
Message-ID: <20230531015849.3229596-11-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230531015849.3229596-1-david@gibson.dropbear.id.au>
Add a helper to bring network interfaces up on a site, and to retrieve
configured IP addresses.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
avocado/tasst/nstool.py | 11 +++++++++--
avocado/tasst/site.py | 29 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/avocado/tasst/nstool.py b/avocado/tasst/nstool.py
index 020e8a0..50598a5 100644
--- a/avocado/tasst/nstool.py
+++ b/avocado/tasst/nstool.py
@@ -118,8 +118,11 @@ class UserNetNsTasst(IsolatedSiteTasst):
:avocado: tags=meta
"""
+ @contextlib.contextmanager
def setup_site(self):
- return UnshareSite(type(self).__name__, '-Ucn')
+ with UnshareSite(type(self).__name__, '-Ucn') as ns:
+ ns.ifup('lo')
+ yield ns
def test_userns(self):
REAL_HOST.require_cmds('capsh')
@@ -142,6 +145,7 @@ class NestedNsTasst(IsolatedSiteTasst):
name = type(self).__name__
with UnshareSite(name + '.userns', '-Uc') as userns:
with UnshareSite(name + '.netns', '-n', parent=userns, sudo=True) as netns:
+ netns.ifup('lo')
yield netns
@@ -152,8 +156,11 @@ class PidNsTasst(IsolatedSiteTasst):
:avocado: tags=meta
"""
+ @contextlib.contextmanager
def setup_site(self):
- return UnshareSite(type(self).__name__, '-Upfn')
+ with UnshareSite(type(self).__name__, '-Upfn') as ns:
+ ns.ifup('lo')
+ yield ns
def test_relative_pid(self):
with self.setup_site() as site:
diff --git a/avocado/tasst/site.py b/avocado/tasst/site.py
index 900e945..3cb3721 100644
--- a/avocado/tasst/site.py
+++ b/avocado/tasst/site.py
@@ -11,6 +11,7 @@
# Author: David Gibson <david@gibson.dropbear.id.au>
import contextlib
+import ipaddress
import json
import avocado
@@ -56,6 +57,28 @@ class Site(contextlib.AbstractContextManager):
info = json.loads(self.output('ip -j link show'))
return [i['ifname'] for i in info]
+ def ifup(self, ifname):
+ self.require_cmds('ip')
+ self.fg('ip link set {} up'.format(ifname), sudo=True)
+
+ def addrinfos(self, ifname, **filter):
+ self.require_cmds('ip')
+ info = json.loads(self.output('ip -j addr show {}'.format(ifname)))
+ assert len(info) == 1 # We specified a specific interface
+
+ ais = [ai for ai in info[0]['addr_info']]
+ for key, value in filter.items():
+ ais = [ai for ai in ais if key in ai and ai[key] == value]
+
+ return ais
+
+ def addrs(self, ifname, **filter):
+ self.require_cmds('ip')
+ # Return just the parsed, non-tentative addresses
+ return [ipaddress.ip_interface('{}/{}'.format(ai['local'], ai['prefixlen']))
+ for ai in self.addrinfos(ifname, **filter)
+ if not 'tentative' in ai]
+
class SiteTasst(Tasst):
"""
@@ -100,6 +123,12 @@ class SiteTasst(Tasst):
with self.setup_site() as site:
self.assertIn('lo', site.ifs())
+ def test_lo_addrs(self):
+ with self.setup_site() as site:
+ expected = [ipaddress.ip_interface(a)
+ for a in ['127.0.0.1/8', '::1/128']]
+ self.assertCountEqual(site.addrs('lo'), expected)
+
class IsolatedSiteTasst(SiteTasst):
"""
--
@@ -11,6 +11,7 @@
# Author: David Gibson <david@gibson.dropbear.id.au>
import contextlib
+import ipaddress
import json
import avocado
@@ -56,6 +57,28 @@ class Site(contextlib.AbstractContextManager):
info = json.loads(self.output('ip -j link show'))
return [i['ifname'] for i in info]
+ def ifup(self, ifname):
+ self.require_cmds('ip')
+ self.fg('ip link set {} up'.format(ifname), sudo=True)
+
+ def addrinfos(self, ifname, **filter):
+ self.require_cmds('ip')
+ info = json.loads(self.output('ip -j addr show {}'.format(ifname)))
+ assert len(info) == 1 # We specified a specific interface
+
+ ais = [ai for ai in info[0]['addr_info']]
+ for key, value in filter.items():
+ ais = [ai for ai in ais if key in ai and ai[key] == value]
+
+ return ais
+
+ def addrs(self, ifname, **filter):
+ self.require_cmds('ip')
+ # Return just the parsed, non-tentative addresses
+ return [ipaddress.ip_interface('{}/{}'.format(ai['local'], ai['prefixlen']))
+ for ai in self.addrinfos(ifname, **filter)
+ if not 'tentative' in ai]
+
class SiteTasst(Tasst):
"""
@@ -100,6 +123,12 @@ class SiteTasst(Tasst):
with self.setup_site() as site:
self.assertIn('lo', site.ifs())
+ def test_lo_addrs(self):
+ with self.setup_site() as site:
+ expected = [ipaddress.ip_interface(a)
+ for a in ['127.0.0.1/8', '::1/128']]
+ self.assertCountEqual(site.addrs('lo'), expected)
+
class IsolatedSiteTasst(SiteTasst):
"""
--
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 ` David Gibson [this message]
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 ` [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-11-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).