diff --git a/gestion/annuaires.py b/gestion/annuaires.py index f11f2f7c..a8c0047c 100755 --- a/gestion/annuaires.py +++ b/gestion/annuaires.py @@ -4,7 +4,7 @@ from types import * # Liste des switchs -bat_switchs = [ 'b', 'c' , 'h' , 'i' , 'g' , 'j' ] +bat_switchs = [ 'a', 'b', 'c' , 'h' , 'i' , 'g' , 'j' ] aide={ 'g' : "appart du RDC=G901" , @@ -23,41 +23,39 @@ aide={ # Correspondance chbre -> prise chbre_prises={ 'a' : -{'101d':'101d' , '101g':'101g' , '102':'102' , '103':'103' , - '104':'104' , '105':'105' , '106':'106' , '107':'107' , - '108':'108' , '109':'109' , '110d':'110d' , '110g':'110g' , - '111d':'111d' , '111g':'111g' , '112d':'112d' , '112g':'112g' , - '113d':'113d' , '113g':'113g' , '114':'114' , '115':'115' , +{'112d':'001','112g':'002', '111d':'003', '111g':'004', +'110d':'005', '110g':'006', ' 109':'007', '108':'008', +'211g':'009', '211d':'010', '212g':'011', '212d':'012', +'213g':'013', '213d':'014', '214':'015', '215':'016', +'313g':'017', '313d':'018', '314':'019', '315':'020', +'301g':'021', '301d':'022', '303':'023', '302':'024', + '204':'025', '205':'026', '206':'027', '207':'028', + '208':'029', '209':'030', '210g':'031', '210d':'032', +'201g':'033', '202':'034', '201d':'035', '203':'036', + '104':'037', '105':'038', '106':'039', '107':'040', +'113g':'041', '113d':'042', '114':'043', '115':'044', +'101g':'045', '101d':'046', '102':'047', '103':'048', - '201d':'201d' , '201g':'201g' , '202':'202' , '203':'203' , - '204':'204' , '205':'205' , '206':'206' , '207':'207' , - '208':'208' , '209':'209' , '210d':'210d' , '210g':'210g' , - '211d':'211d' , '211g':'211g' , '212d':'212d' , '212g':'212g' , - '213d':'213d' , '213g':'213g' , '214':'214' , '215':'215' , +'506d':'101', '506g':'102', '505d':'103', '505g':'104', +'504d':'105', '504g':'106', '503d':'107', '503g':'108', +'410d':'109', '410g':'110', '409':'111', '408':'112', + '407':'113', '406':'114', '405':'115', '404':'116', + '307':'117', '306':'118', '305':'119', '304':'120', + '403':'121', '402':'122', '401d':'123', '401g':'124', + '308':'125', '309':'126', '310g':'127', '310d':'128', +'311g':'129', '311d':'130', '312g':'131', '312d':'132', +'411g':'133', '411d':'134', '412g':'135', '412d':'136', +'413g':'137', '413d':'138', '414':'139', '415':'140', +'507g':'141', '507d':'142', '508g':'143', '508d':'144', +'501g':'145', '501d':'146', '502g':'147', '502d':'148', - '301d':'301d' , '301g':'301g' , '302':'302' , '303':'303' , - '304':'304' , '305':'305' , '306':'306' , '307':'307' , - '308':'308' , '309':'309' , '310d':'310d' , '310g':'310g' , - '311d':'311d' , '311g':'311g' , '312d':'312d' , '312g':'312g' , - '313d':'313d' , '313g':'313g' , '314':'314' , '315':'315' , +'603g':'201', '603d':'202', '604g':'203', '604d':'204', +'605g':'205', '605d':'206', '606g':'207', '606d':'208', +'607g':'209', '607d':'210', '601g':'211', '601d':'212', +'602g':'213', '602d':'214', 'cl5':'215', 'cl4':'216', + 'cl3':'217', 'cl2':'218' }, - '401d':'401d' , '401g':'401g' , '402':'402' , '403':'403' , - '404':'404' , '405':'405' , '406':'406' , '407':'407' , - '408':'408' , '409':'409' , '410d':'410d' , '410g':'410g' , - '411d':'411d' , '411g':'411g' , '412d':'412d' , '412g':'412g' , - '413d':'413d' , '413g':'413g' , '414':'414' , '415':'415' , - - '501d':'501d' , '501g':'501g' , '502d':'502d' , '502g':'502g' , - '503d':'503d' , '503g':'503g' , '504d':'504d' , '504g':'504g' , - '505d':'505d' , '505g':'505g' , '506d':'506d' , '506g':'506g' , - '507d':'507d' , '507g':'507g' , '507d':'507d' , '508g':'508g' , - - '601d':'601d' , '601g':'601g' , '602d':'602d' , '602g':'602g' , - '603d':'603d' , '603g':'603g' , '604d':'604d' , '604g':'604g' , - '605d':'605d' , '605g':'605g' , '606d':'606d' , '606g':'606g' , - '607d':'607d' , '607g':'607g' , '607d':'607d' , '608g':'608g' } , - -'b' : +'b' : {'cl0':'047' , 'cl1':'045' , '105':'001' , '106':'002' , '107':'003' , '108':'004' , '120g':'005' , '120d':'006' , '121g':'007' , '121d':'008' , @@ -471,6 +469,10 @@ uplink_prises={ 'i' : 449 : 'uplink->batg2' , 450 : 'uplink->batg5' , 549 : 'uplink->batg4' , 550 : 'uplink->batg6' , 649 : 'uplink->batg5' , 547 : 'wifi_lodur' } , +'a' : +{ 49 : 'uplink->backbone', 50 : 'uplink->bata1', + 149 : 'uplink->bata', 150 : 'uplink->bata2', + 225 : 'uplink->bata1' }, 'b' : { 49 : 'uplink->backbone', 50 : 'uplink->batb1', 149 : 'uplink->batb', 150 : 'uplink->batb2',