Add a helper to bring network interfaces up on a site, and to retrieve
configured IP addresses.
Signed-off-by: David Gibson <david(a)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(a)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