hptools: secrets_new et débarras de ldap_crans

This commit is contained in:
Daniel STAN 2014-03-23 18:29:09 +01:00
parent 7c95f97ba3
commit 22e7e40c2c

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/bin/bash /usr/scripts/python.sh
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
@ -14,23 +14,23 @@ TODO réécrire ce script (la moitié des fonctions ne marchent plus,
from time import sleep from time import sleep
from sys import stderr, path from sys import stderr, path
from commands import getstatusoutput from commands import getstatusoutput
from annuaires_pg import chbre_prises, all_switchs
from os.path import exists from os.path import exists
from os import system from os import system
import os import os
import sys import sys
from re import findall from re import findall
import re import re
from config import vlans
import netsnmp import netsnmp
path.append('/usr/scripts/gestion') if '/usr/scripts' not in sys.path:
from ldap_crans import crans_ldap path.append('/usr/scripts')
cl = crans_ldap() import gestion.secrets_new as secrets
from gestion.config import vlans
from gestion.annuaires_pg import chbre_prises, all_switchs
try: try:
path.append('/usr/scripts/gestion/secrets') config_snmp_secrete = secrets.get('config_snmp_secrete')
from secrets import config_snmp_secrete, reconf_snmp reconf_snmp = secrets.get('reconf_snmp')
except: except:
# Si a pas le droit de lire config_snmp_secrete # Si a pas le droit de lire config_snmp_secrete
# on va tenter de tout faire en snmpv1 et communauté public # on va tenter de tout faire en snmpv1 et communauté public
@ -140,15 +140,13 @@ class snmp :
else : else :
raise ValueError('Version incorrecte') raise ValueError('Version incorrecte')
def getBaseMac(self):
''' retourne la Base Mac du switch concerné. C'est elle qui est
utilisée pour l'engineid.'''
switch = cl.search("host=%s" % self.host)["machineCrans"][0]
baseMac = switch.mac().replace(':', '')[0:11] + '0'
return baseMac
def fetch_engineid(self): def fetch_engineid(self):
self._engineid = '0000000b0000%s' % self.getBaseMac() short_host = self.host.split('.', 1)[0]
try:
self._engineid = secrets.get('engineid').get(short_host, None)
except:
self._engineid = None
def __exec(self,cmd) : def __exec(self,cmd) :
status, response = getstatusoutput(cmd) status, response = getstatusoutput(cmd)