xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 01:22:00 +00:00
Code Issues Projects Releases Wiki Activity

Rename endpoint unreachable exception to be more genericly applicable

Browse Source
This commit is contained in:
Jarrod Johnson 2014-04-01 16:32:56 -04:00
parent 17bf92ce16
commit 6fcfc70985
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent/exceptions.py
View File

@ -11,7 +11,7 @@ class InvalidArgumentException(ConfluentException):
# like http code 400
pass
class TargetEndpointTimeout(ConfluentException):
class TargetEndpointUnreachable(ConfluentException):
# A target system was unavailable. For example, a BMC
# was unreachable. http code 504
pass

16
plugins/hardwaremanagement/ipmi.py
View File

@ -11,6 +11,7 @@ import os
import pyghmi.exceptions as pygexc
import pyghmi.ipmi.console as console
import pyghmi.ipmi.command as ipmicommand
import socket
console.session.select = eventlet.green.select
console.session.threading = eventlet.green.threading
@ -87,11 +88,14 @@ class IpmiConsole(conapi.Console):
def connect(self,callback):
self.datacallback = callback
self.solconnection = console.Console(bmc=self.bmc, port=self.port,
userid=self.username,
password=self.password, kg=self.kg,
force=True,
iohandler=self.handle_data)
try:
self.solconnection = console.Console(bmc=self.bmc, port=self.port,
userid=self.username,
password=self.password,
kg=self.kg, force=True,
iohandler=self.handle_data)
except socket.gaierror as err:
raise exc.TargetEndpointUnreachable(str(err))
def write(self, data):
self.solconnection.send_data(data)
@ -159,7 +163,7 @@ class IpmiHandler(object):
self._logevt.wait()
if self.broken:
if self.error == 'timeout':
raise exc.TargetEndpointTimeout()
raise exc.TargetEndpointUnreachable('Target timed out')
else:
raise Exception(self.error)
if self.element == [ 'power', 'state' ]: