yohan/brie-aurore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verification de l'unicité de l'adresse IP avant la suppression de la machine

Browse Source
This commit is contained in:
Romain Beuque 2014-02-21 22:38:47 +01:00
parent ddd76e3f76
commit d7987bb048
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Brie/brie/controllers/edit.py
View File

@ -636,6 +636,7 @@ class MachineDeleteController(AuthenticatedRestController):
machine = Machine.get_machine_by_id(self.user, member.dn, machine_id) machine = Machine.get_machine_by_id(self.user, member.dn, machine_id)
dns = Machine.get_dns_by_id(self.user, machine.dn) dns = Machine.get_dns_by_id(self.user, machine.dn)
ip = IpReservation.get_ip(self.user, residence_dn, dns.dlzData.first()) ip = IpReservation.get_ip(self.user, residence_dn, dns.dlzData.first())
ip_machines = Machine.get_dns_by_ip(self.user, residence_dn, ip.cn.first())
# Si la machine existe effectivement, on la supprime # Si la machine existe effectivement, on la supprime
if machine is not None: if machine is not None:
@ -644,8 +645,10 @@ class MachineDeleteController(AuthenticatedRestController):
self.user.ldap_bind.delete_entry_subtree(machine.dn) self.user.ldap_bind.delete_entry_subtree(machine.dn)
taken_attribute = IpReservation.taken_attr(ip.get("x-taken").first()) if len(ip_machines) == 1:
self.user.ldap_bind.delete_attr(ip.dn, taken_attribute) taken_attribute = IpReservation.taken_attr(ip.get("x-taken").first())
self.user.ldap_bind.delete_attr(ip.dn, taken_attribute)
#end if
#end if #end if
# On redirige sur la page d'édition du membre # On redirige sur la page d'édition du membre