Renommage de classes.
darcs-hash:20060323120058-68412-a54de9761bb2536361ce0c3422a4504dd2dcc7ef.gz
This commit is contained in:
parent
389b9d1030
commit
3d0f609ee6
2 changed files with 28 additions and 35 deletions
|
@ -4,10 +4,10 @@
|
||||||
import sys
|
import sys
|
||||||
sys.path.append('/usr/scripts/gestion')
|
sys.path.append('/usr/scripts/gestion')
|
||||||
|
|
||||||
from ldap_crans import invite, crans_ldap
|
from ldap_crans import Invite, crans_ldap
|
||||||
|
|
||||||
machines = crans_ldap().search('host=invite-ens-*.wifi.crans.org','w')['machine']
|
machines = crans_ldap().search('host=invite-ens-*.wifi.crans.org','w')['machine']
|
||||||
|
|
||||||
for m in machines :
|
for m in machines :
|
||||||
if m.proprietaire().__class__ == invite :
|
if m.proprietaire().__class__ == Invite :
|
||||||
m.delete('Machine invitée de l\'ens - détruite par cron')
|
m.delete('Machine invitée de l\'ens - détruite par cron')
|
||||||
|
|
|
@ -2887,57 +2887,50 @@ class BorneWifi(Machine):
|
||||||
return new
|
return new
|
||||||
|
|
||||||
|
|
||||||
class _fake_proprio(crans_ldap):
|
class _FakeProprio(crans_ldap):
|
||||||
""" Définitions de base d'un propriétaire virtuel """
|
""" Définitions de base d'un propriétaire virtuel """
|
||||||
idn = ''
|
idn = ''
|
||||||
def __init__(s, conn=None):
|
def __init__(self, conn=None):
|
||||||
s.conn = conn
|
self.conn = conn
|
||||||
if not s.conn:
|
if not self.conn:
|
||||||
s.connect()
|
self.connect()
|
||||||
s.dn = s.base_dn
|
self.dn = self.base_dn
|
||||||
def id(s):
|
def id(self):
|
||||||
return ''
|
return ''
|
||||||
def blacklist(s):
|
def blacklist(self):
|
||||||
return []
|
return []
|
||||||
def paiement(s):
|
def paiement(self):
|
||||||
return [ ann_scol ]
|
return [ ann_scol ]
|
||||||
def carteEtudiant(s):
|
def carteEtudiant(self):
|
||||||
return [ ann_scol ]
|
return [ ann_scol ]
|
||||||
def blacklist_actif(s):
|
def blacklist_actif(self):
|
||||||
return []
|
return []
|
||||||
def mail(self, new=None):
|
def mail(self, new=None):
|
||||||
return 'roots@crans.org'
|
return 'roots@crans.org'
|
||||||
def machines(s):
|
def machines(self):
|
||||||
res = s.conn.search_s(s.dn, 1, 'objectClass=machine')
|
res = self.conn.search_s(self.dn, 1, Machine.filtre_idn)
|
||||||
m = []
|
m = []
|
||||||
for r in res:
|
for r in res:
|
||||||
if r[1].has_key('puissance'):
|
m.append(self.make(r))
|
||||||
m.append(BorneWifi(r, '', s.conn))
|
|
||||||
else:
|
|
||||||
m.append(Machine(r, '', s.conn))
|
|
||||||
return m
|
return m
|
||||||
|
|
||||||
class crans(_fake_proprio):
|
class crans(_FakeProprio):
|
||||||
""" Classe définissant l'assoce (pour affichage de ses machines) """
|
""" Classe définissant l'assoce (pour affichage de ses machines) """
|
||||||
def __init__(s, conn=None):
|
def __init__(self, conn=None):
|
||||||
s.conn = conn
|
_FakeProprio.__init__(self, conn)
|
||||||
if not s.conn:
|
def Nom(self):
|
||||||
s.connect()
|
|
||||||
s.dn = s.base_dn
|
|
||||||
def Nom(s):
|
|
||||||
return u"Crans"
|
return u"Crans"
|
||||||
def chbre(s):
|
def chbre(self):
|
||||||
return u"CRA"
|
return u"CRA"
|
||||||
|
|
||||||
class invite(_fake_proprio):
|
class invite(_FakeProprio):
|
||||||
""" Propriétaire des machines invité """
|
""" Propriétaire des machines invitées """
|
||||||
def __init__(s, conn=None):
|
def __init__(self, conn=None):
|
||||||
s.conn = conn
|
_FakeProprio.__init__(self, conn)
|
||||||
if not s.conn: s.connect()
|
self.dn = "ou=invites," + self.base_dn
|
||||||
s.dn = "ou=invites," + s.base_dn
|
def Nom(self):
|
||||||
def Nom(s):
|
|
||||||
return u"Invité"
|
return u"Invité"
|
||||||
def chbre(s):
|
def chbre(self):
|
||||||
return u"N/A"
|
return u"N/A"
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue