[ldap_crans] ajout d'un try pour regen dhcp

sorry Yoda...
This commit is contained in:
Daniel STAN 2013-09-05 19:38:06 +02:00
parent cd4000b45d
commit f17e95d466

View file

@ -10,6 +10,7 @@ Licence : GPLv2
""" """
from socket import gethostname from socket import gethostname
import socket
import smtplib, re, os, random, string, time, sys, pwd import smtplib, re, os, random, string, time, sys, pwd
import errno import errno
import ldap, ldap.modlist, ldap_passwd import ldap, ldap.modlist, ldap_passwd
@ -3200,9 +3201,12 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
if reconf_ip: if reconf_ip:
from gen_confs.dhcpd_new import dydhcp from gen_confs.dhcpd_new import dydhcp
for server in config.dhcp_servers: for server in config.dhcp_servers:
dhcp=dydhcp(server) try:
dhcp.del_host(self._init_data.get('ipHostNumber',[self.ip()])[0],self._init_data.get('macAddress',[self.mac()])[0]) dhcp=dydhcp(server)
dhcp.add_host(self._data.get('ipHostNumber',[self.ip()])[0],self._data.get('macAddress',[self.mac()])[0],self.nom()) dhcp.del_host(self._init_data.get('ipHostNumber',[self.ip()])[0],self._init_data.get('macAddress',[self.mac()])[0])
dhcp.add_host(self._data.get('ipHostNumber',[self.ip()])[0],self._data.get('macAddress',[self.mac()])[0],self.nom())
except socket.error:
sys.stderr.write((u'Dhcp generate failed for %s\n' % server).encode('utf-8'))
# Enregistrement # Enregistrement
self._save() self._save()
@ -3272,8 +3276,11 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
# On supprime la machine du dhcp # On supprime la machine du dhcp
from gen_confs.dhcpd_new import dydhcp from gen_confs.dhcpd_new import dydhcp
for server in config.dhcp_servers: for server in config.dhcp_servers:
dhcp=dydhcp(server) try:
dhcp.del_host(self.ip(),self.mac()) dhcp=dydhcp(server)
dhcp.del_host(self.ip(),self.mac())
except socket.error:
sys.stderr.write((u'Dhcp generate failed for %s\n' % server).encode('utf-8'))
# Services à redémarrer # Services à redémarrer
self.services_to_restart('dhcp') self.services_to_restart('dhcp')