Bladeren bron

Fix interface cleanup

JDierkse 4 jaren geleden
bovenliggende
commit
9c6a16f983
1 gewijzigde bestanden met toevoegingen van 11 en 6 verwijderingen
  1. 11 6
      net-dhcp/network.py

+ 11 - 6
net-dhcp/network.py

@@ -253,12 +253,17 @@ def delete_endpoint():
     if_host, _if_container = veth_pair(req['EndpointID'])
     if_host = interface.GetInterface(LIBRARY, if_host)
 
-    if library == 'NDB':
-        bridge = net_bridge(req['NetworkID'])
-        interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname)
-    else:
-        interface.DelPort(LIBRARY, 'dummy0', if_host.ifname)
-    interface.RemoveInterface(LIBRARY, if_host.ifname)
+    try:
+        if LIBRARY == 'NDB':
+            logger.info('1')
+            bridge = net_bridge(req['NetworkID'])
+            interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname)
+        else:
+            logger.info('2')
+            interface.DelPort(LIBRARY, 'dummy0', if_host.ifname)
+        interface.RemoveInterface(LIBRARY, if_host.ifname)
+    except Exception as e:
+        logger.exception(e)
 
     return jsonify({})