Detabification
darcs-hash:20050421100719-d1718-6dc337636c37181ae4af40fb0fde44cc21b6a751.gz
This commit is contained in:
parent
e89706bfc3
commit
e236f41035
1 changed files with 18 additions and 18 deletions
|
@ -63,9 +63,9 @@ subnet %(network)s netmask %(netmask)s {
|
|||
|
||||
host_template="""
|
||||
host %(nom)s {
|
||||
hardware ethernet %(mac)s;
|
||||
fixed-address %(ip)s;
|
||||
option host-name "%(nom)s";
|
||||
hardware ethernet %(mac)s;
|
||||
fixed-address %(ip)s;
|
||||
option host-name "%(nom)s";
|
||||
}
|
||||
"""
|
||||
|
||||
|
@ -84,7 +84,7 @@ subnet %(network)s netmask %(netmask)s {
|
|||
######################################FIN PARTIE DE CONFIGURATION
|
||||
|
||||
def __str__(self) :
|
||||
return 'dhcp'
|
||||
return 'dhcp'
|
||||
|
||||
def _gen(self) :
|
||||
warnings =''
|
||||
|
@ -92,23 +92,23 @@ subnet %(network)s netmask %(netmask)s {
|
|||
### Construction de la partie du fichier contenant les machines
|
||||
hosts={}
|
||||
|
||||
self.anim.iter=len(self.machines)
|
||||
for machine in self.machines :
|
||||
self.anim.cycle()
|
||||
t = 0
|
||||
for net in self.reseaux.keys() :
|
||||
if AddrInNet(machine.ip(),net) :
|
||||
d = { 'nom' : machine.nom().split('.')[0] , 'mac' : machine.mac() , 'ip' : machine.ip() }
|
||||
try : hosts[net] += self.host_template % d
|
||||
except : hosts[net] = self.host_template % d
|
||||
t = 1
|
||||
self.anim.iter=len(self.machines)
|
||||
for machine in self.machines :
|
||||
self.anim.cycle()
|
||||
t = 0
|
||||
for net in self.reseaux.keys() :
|
||||
if AddrInNet(machine.ip(),net) :
|
||||
d = { 'nom' : machine.nom().split('.')[0] , 'mac' : machine.mac() , 'ip' : machine.ip() }
|
||||
try : hosts[net] += self.host_template % d
|
||||
except : hosts[net] = self.host_template % d
|
||||
t = 1
|
||||
|
||||
### Ecriture du fichier
|
||||
fd = self._open_conf(self.DHCPD_CONF,'#')
|
||||
for net, options in self.reseaux.items() :
|
||||
if not hosts.has_key(net) :
|
||||
warnings += u'Réseau %s ignoré : aucune machine à servir\n' % net
|
||||
continue
|
||||
warnings += u'Réseau %s ignoré : aucune machine à servir\n' % net
|
||||
continue
|
||||
d = param(net)
|
||||
d['OPTIONS_RESEAU'] = options
|
||||
d['HOSTs'] = hosts[net]
|
||||
|
@ -117,4 +117,4 @@ subnet %(network)s netmask %(netmask)s {
|
|||
|
||||
fd.close()
|
||||
|
||||
return warnings
|
||||
return warnings
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue