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

Quand un switch n'existe pas, il faut planter.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-04-25 18:14:29 +02:00
parent 4205d73132
commit b65466de08
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/hptools2/__init__.py
View file

@ -3,7 +3,7 @@
import os import os
from .switch import HPSwitch from .switch import HPSwitch, SwitchNotFound
from .tools import trace_mac from .tools import trace_mac
import gestion.config.snmp as config_snmp import gestion.config.snmp as config_snmp

9
gestion/hptools2/switch.py
View file

@ -10,6 +10,10 @@ from .snmp import SNMPClient
from .mac import format_mac, MACFactory from .mac import format_mac, MACFactory
from .defaults import OPERSTATUS, ADMINSTATUS, ETHSPEED, REV_ETHSPEED from .defaults import OPERSTATUS, ADMINSTATUS, ETHSPEED, REV_ETHSPEED
class SwitchNotFound(Exception):
"""Erreur basique quand le switch n'est pas trouvé"""
pass
class HPSwitchFactory(object): class HPSwitchFactory(object):
"""Factory stockant les switches""" """Factory stockant les switches"""
@ -44,7 +48,10 @@ class HPSwitch(object):
try: try:
__switch = socket.gethostbyname_ex(switch)[0] __switch = socket.gethostbyname_ex(switch)[0]
except socket.gaierror: except socket.gaierror:
__switch = switch try:
netaddr.IPAddress(switch)
except netaddr.AddrFormatError:
raise SwitchNotFound
switch_object = HPSwitchFactory.get_switch(__switch) switch_object = HPSwitchFactory.get_switch(__switch)
if switch_object is None: if switch_object is None: