ipdb: support net_ns_pid

Bug-Url: #306

pyroute2/ipdb/interface.py

@@ -67,7 +67,8 @@ class Interface(Transactional):
                        'vlans',
                        'ipaddr',
                        'ports',
-                       'net_ns_fd']
+                       'net_ns_fd',
+                       'net_ns_pid']
     _fields = [ifinfmsg.nla2name(i[0]) for i in ifinfmsg.nla_map]
     for name in ('bridge_data', ):
         data = getattr(ifinfmsg.ifinfo, name)
@@ -705,6 +706,7 @@ def error(x):
             request = IPLinkRequest()
             for key in added:
                 if (key == 'net_ns_fd') or \
+                        (key == 'net_ns_pid') or \
                         (key not in self._virtual_fields) and \
                         (key != 'kind'):
                     request[key] = added[key]
@@ -725,7 +727,7 @@ def error(x):
                     run(nl.link, 'set', **request)
                 # hardcoded pause -- if the interface was moved
                 # across network namespaces
-                if 'net_ns_fd' in request:
+                if ('net_ns_fd' in request) or ('net_ns_pid' in request):
                     while True:
                         # wait until the interface will disappear
                         # from the main network namespace

tests/general/test_netns.py

@@ -158,7 +158,37 @@ def test_create_peer_attrs(self):
         netnsmod.remove(foo)
         netnsmod.remove(bar)
 
-    def test_move_interface(self):
+    def test_move_ns_pid(self):
+        foo = str(uuid4())
+        bar = str(uuid4())
+        ifA = uifname()
+        netnsmod.create(foo)
+        netnsmod.create(bar)
+
+        ns_foo = IPDB(nl=NetNS(foo))
+        ns_bar = IPDB(nl=NetNS(bar))
+
+        try:
+            ns_foo.create(ifname=ifA, kind='dummy').commit()
+            with ns_foo.interfaces[ifA] as iface:
+                iface.net_ns_pid = ns_bar.nl.server.pid
+
+            assert ifA in ns_bar.interfaces.keys()
+            assert ifA not in ns_foo.interfaces.keys()
+
+            with ns_bar.interfaces[ifA] as iface:
+                iface.net_ns_pid = ns_foo.nl.server.pid
+
+            assert ifA not in ns_bar.interfaces.keys()
+            assert ifA in ns_foo.interfaces.keys()
+
+        finally:
+            ns_foo.release()
+            ns_bar.release()
+            netnsmod.remove(foo)
+            netnsmod.remove(bar)
+
+    def test_move_ns_fd(self):
         foo = str(uuid4())
         bar = str(uuid4())
         ifA = uifname()