rename to iproute2

Author: costasd

test/test_modules.py

@@ -651,47 +651,47 @@ def test_interface(host, family):
 
 
 def test_iproute2_links(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    links = host.ip.links()
+    links = host.iproute2.links()
     assert len(links) > 0 and len(links) < 4
 
     assert links[0].get("ifname") and links[0].get("ifindex")
 
 
 def test_iproute2_routes(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    routes = host.ip.routes()
+    routes = host.iproute2.routes()
     assert len(routes) > 0
 
 
 def test_iproute2_rules(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    rules = host.ip.rules()
+    rules = host.iproute2.rules()
     assert len(rules) > 0 and len(rules) < 4
     assert rules[0].get("priority") == 0
     assert rules[0].get("src") == "all"
     assert rules[0].get("table") == "local"
 
 
 def test_iproute2_tunnels(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    tunnels = host.ip.tunnels()
+    tunnels = host.iproute2.tunnels()
     assert len(tunnels) == 0
 
 
 def test_iproute2_vrfs(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    vrfs = host.ip.vrfs()
+    vrfs = host.iproute2.vrfs()
     assert len(vrfs) == 0
 
 
 def test_iproute2_netns(host):
-    assert host.ip.exists
+    assert host.iproute2.exists
 
-    namespaces = host.ip.netns()
+    namespaces = host.iproute2.netns()
     assert len(namespaces) == 0

testinfra/modules/__init__.py

@@ -27,7 +27,7 @@
     "group": "group:Group",
     "interface": "interface:Interface",
     "iptables": "iptables:Iptables",
-    "ip": "ip:IP",
+    "iproute2": "iproute2:IProute2",
     "mount_point": "mountpoint:MountPoint",
     "package": "package:Package",
     "pip": "pip:Pip",

testinfra/modules/ip.py renamed to testinfra/modules/iproute2.py

@@ -16,10 +16,10 @@
 from testinfra.modules.base import InstanceModule
 
 
-class IP(InstanceModule):
+class IProute2(InstanceModule):
     """Test network configuration via iproute2 commands
 
-    >>> host.ip.rules()
+    >>> host.iproute2.rules()
 
     host.ip.rules(from,to,tos,fwmark,iif,oif,pref, uidrange, ipproto, sport, dport)
     host.ip.routes(table, device, scope, proto, src, metric)
@@ -28,11 +28,11 @@ class IP(InstanceModule):
     host.ip.tunnels()
 
     Optionally, the protocol family can be provided to reduce the number of routes returned:
-    >>> host.ip.routes("inet6", table="main")
+    >>> host.iproute2.routes("inet6", table="main")
     ...FIX
 
     Optionally, this can work inside a different network namespace:
-    >>> host.ip.routes("inet6", "vpn")
+    >>> host.iproute2.routes("inet6", "vpn")
     ...FIX
     """
 
@@ -97,6 +97,6 @@ def netns(self):
         """Return all configured network namespaces"""
         cmd = f"{self._ip} --json netns show"
         out = self.check_output(cmd)
-        if out is None:  # ip netns returns null instead of [] in json mode
-            return json.loads("[]")
+        if not out:  # ip netns returns null instead of [] in json mode
+            return json.loads("[]\n")
         return json.loads(out)