crans/lc_ldap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[global/rid] Commit associé à http://git.crans.org/?p=usr-scripts.git;a=commit;h=a442fd6b22c400800e7c5bd870e83e4027a1d76f

Browse source 
* Maintenant, on va pouvoir identifier formellement les machines v6-only et les autres, sans perdre
 la possibilité de passer de l'une à l'autre rapidement (avec les changements qui vont bien)
This commit is contained in:
Pierre-Elliott Bécue 2013-05-30 01:15:24 +02:00
parent 60ded9f830
commit cd75ed7bd4
5 changed files with 79 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

28
objets.py
View file

@ -708,20 +708,20 @@ class machineWifi(machine):
attribs = machine.attribs + [attributs.ipsec]
ldap_name = "machineWifi"
def set_ipv4(self, login=None):
u"""Définie une ipv4 à la machine si elle n'est possède pas déjà une."""
if login is None:
login = self.conn.current_login
if not 'ipHostNumber' in self.attrs.keys() or not self['ipHostNumber']:
rid = self['rid']=[ unicode(self.conn._find_id('rid', range(config.rid['wifi'][0], config.rid['wifi'][1]))) ]
ip = self['ipHostNumber'] = [ unicode(crans_utils.ip4_of_rid(int(rid[0]))) ]
self.history_add(login, u"rid")
self.history_add(login, u"ipHostNumber (N/A -> %s)" % ip[0])
self.save()
for server in config.dhcp_servers:
dhcp=dydhcp(server)
dhcp.add_host(str(self['ipHostNumber'][0]), str(self['macAddress'][0]), str(self['host'][0]))
# À passer là où il faut
# def set_ipv4(self, login=None):
# u"""Définie une ipv4 à la machine si elle n'est possède pas déjà une."""
# if login is None:
# login = self.conn.current_login
# if not 'ipHostNumber' in self.attrs.keys() or not self['ipHostNumber']:
# rid = self['rid']=[ unicode(self.conn._find_id('rid', range(config.rid['wifi'][0], config.rid['wifi'][1]+1))) ]
# ip = self['ipHostNumber'] = [ unicode(crans_utils.ip4_of_rid(int(rid[0]))) ]
# self.history_add(login, u"rid")
# self.history_add(login, u"ipHostNumber (N/A -> %s)" % ip[0])
# self.save()
# from gen_confs.dhcpd_new import dydhcp
# dhcp=dydhcp()
# dhcp.add_host(str(self['ipHostNumber'][0]), str(self['macAddress'][0]), str(self['host'][0]))
@crans_object
class machineCrans(machine):