Merge pull request iovisor#114 from iovisor/weichunc_dev

release IPDB in host ns early
ErickReyesR · Aug 4, 2015 · b3d5864 · b3d5864
2 parents 3ba6ad8 + b67b607
commit b3d5864
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/examples/distributed_bridge/tunnel.py b/examples/distributed_bridge/tunnel.py
@@ -12,6 +12,7 @@
 from pyroute2 import IPRoute, NetNS, IPDB, NSPopen
 from socket import htons, AF_INET
 from threading import Thread
+from subprocess import call
 
 host_id = int(argv[1])
 
@@ -68,11 +69,11 @@ def run():
 
 try:
     run()
+    ipdb.release()
     input("")
     print("---")
     for k, v in mac2host.items():
         print(EUI(k.mac), k.ifindex, IPAddress(v.remote_ipv4),
               v.tunnel_id, v.rx_pkts, v.tx_pkts)
 finally:
-    for v in ifc_gc: ipdb.interfaces[v].remove().commit()
-    ipdb.release()
+    for v in ifc_gc: call(["ip", "link", "del", v])
diff --git a/examples/distributed_bridge/tunnel_mesh.py b/examples/distributed_bridge/tunnel_mesh.py
@@ -12,6 +12,7 @@
 from pyroute2 import IPRoute, NetNS, IPDB, NSPopen
 from socket import htons, AF_INET
 from threading import Thread
+from subprocess import call
 
 num_hosts = int(argv[1])
 host_id = int(argv[2])
@@ -73,8 +74,8 @@ def run():
 
 try:
     run()
+    ipdb.release()
     input("")
     print("---")
 finally:
-    for v in ifc_gc: ipdb.interfaces[v].remove().commit()
-    ipdb.release()
+    for v in ifc_gc: call(["ip", "link", "del", v])