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

adm taggued + adh untaggued pour serveur mixte

Browse source
This commit is contained in:
Daniel STAN 2015-01-16 12:15:16 +01:00
parent 1edd471ecb
commit 4992818761
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gestion/gen_confs/switchs2.py
View file

@ -156,10 +156,17 @@ class Port(object):
"""Renvoie V_TAGGED, V_UNTAGGED ou V_NO
suivant le ``vlan`` (str) demandé"""
if self.servers:
if vlan == 'adm':
return V_UNTAGGED
hosts = [unicode(h) for serv in self.servers for h in serv['host']]
if all(host.endswith('.adm.crans.org') for host in hosts):
if vlan == 'adm':
return V_UNTAGGED
else:
return V_NO
else:
return V_NO
if vlan == 'adherent':
return V_UNTAGGED
else:
return V_TAGGED
if self.uplink:
# TODO retirer ce hack dégueux: tous les switchs devraient tout
# tagguer, même le vlan adhérent