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

suppression des plages d'ips par batiments

Browse source 
darcs-hash:20080918212758-c41ad-b07138e4cc528ad55a577218a5b8a4791e9872c5.gz
This commit is contained in:
Jeremie Dimino 2008-09-18 23:27:58 +02:00
parent a8cd71d80f
commit 226f9af045
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gestion/config.py
View file

@ -356,17 +356,10 @@ Message cr
# komaz car c'est la route par défaut mais aussi pour zamok et sila
# à cause de leur firewall et de leur patte wifi.
NETs = { 'serveurs' : [ '138.231.136.0/28' ],
'b' : [ '138.231.137.0/24' ],
'm' : [ '138.231.138.0/24' ],
'c' : [ '138.231.139.0/24' ],
'e' : [ '138.231.143.0/24' ], # E = EXT, on les colle sur le H
'p' : [ '138.231.140.0/25' ],
'a' : [ '138.231.140.128/25'],
'g' : [ '138.231.141.128/25' ], # on donne des ip au J
'i' : [ '138.231.142.0/25' ],
'j' : [ '138.231.142.128/25','138.231.141.0/25'], # il y a pénurie d'@IP au J, on ajoute la moitié de celles du G
'h' : [ '138.231.143.0/24' ],
'vlan-adm' : [ '10.231.136.0/24' ],
'adherents' : [ '138.231.137.0/24',
'138.231.138.0/24',
'138.231.139.0/24',
'138.231.140.0/22' ],
'bornes' : [ '138.231.148.0/24' ],
'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24',
'138.231.147.0/24', '138.231.149.0/24', '138.231.150.0/24', '138.231.151.0/24'],

10
gestion/ldap_crans.py
View file

@ -2787,16 +2787,12 @@ class Machine(BaseClasseCrans):
net = [ '0.0.0.0/0' ]
pool_ip = lister_ip_dispo('all')
else:
gratuit = 0
proprio = self.proprietaire()
if isinstance(proprio, Adherent):
if not proprio.adherentPayant():
gratuit = 1
if gratuit == 0:
if isinstance(proprio, Adherent) and proprio.adherentPayant():
try:
net = config.NETs[proprio.chbre()[0].lower()]
pool_ip = lister_ip_dispo(proprio.chbre()[0].lower())
net = config.NETs['adherents']
pool_ip = lister_ip_dispo('adherents')
except:
raise RuntimeError(u'Impossible de trouver le réseau où placer la machine.')
else: