From 7d33e2d15419e67ff4b1efe1bea7012171b48402 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 4 Oct 2018 00:04:48 -0400 Subject: [PATCH] Commit a few more bugs --- router-daemon/pvcrd/VXNetworkInstance.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/router-daemon/pvcrd/VXNetworkInstance.py b/router-daemon/pvcrd/VXNetworkInstance.py index 57b8d36b..490b526a 100644 --- a/router-daemon/pvcrd/VXNetworkInstance.py +++ b/router-daemon/pvcrd/VXNetworkInstance.py @@ -156,14 +156,20 @@ class VXNetworkInstance(): ) ) entry = '{},{}'.format(reservation, ipaddr) - with open(filename, 'w') as outfile: - outfile.write(entry) + outfile = open(filename, 'w') + outfile.write(entry) + outfile.close() + for reservation in self.dhcp_reservations: if reservation not in reservations: filename = '{}/{}'.format(self.dnsmasq_hostsdir, reservation) # Remove old reservation file - os.remove(filename) - self.dhcp_server_daemon.signal('hup') + try: + os.remove(filename) + self.dhcp_server_daemon.signal('hup') + except: + pass + self.dhcp_reservations = reservations def getvni(self): @@ -340,7 +346,7 @@ class VXNetworkInstance(): def stopDHCPServer(self): if self.dhcp_server_daemon: ansiiprint.echo( - 'Stopping DHCP server on interface {} (VNI {})'.format( + 'Stopping dnsmasq DHCP server on interface {} (VNI {})'.format( self.bridge_nic, self.vni ),