openstack/ironic
Code Issues Proposed changes

Fix logging and exceptions messages in ipminative driver

Browse Source 
1) Log level changed to "error" when exception is raised.
2) Full error message passed to IPMIFailure exception.
3) Target power state passed to PowerStateFailure instead of
returned state.

Change-Id: I62a78cfc330054180a8d92693e04609150c4b97b
This commit is contained in:
Yuriy Zveryanskyy 2015-08-26 12:47:25 +03:00
parent 8cd56e3e1e
commit e946ef026b
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ironic/drivers/modules/ipminative.py
View File

@ -134,8 +134,8 @@ def _power_on(driver_info):
from ipmi. from ipmi.
""" """
msg = _LW("IPMI power on failed for node %(node_id)s with the " msg = _("IPMI power on failed for node %(node_id)s with the "
"following error: %(error)s") "following error: %(error)s")
try: try:
ipmicmd = ipmi_command.Command(bmc=driver_info['address'], ipmicmd = ipmi_command.Command(bmc=driver_info['address'],
userid=driver_info['username'], userid=driver_info['username'],
@ -143,15 +143,17 @@ def _power_on(driver_info):
wait = CONF.ipmi.retry_timeout wait = CONF.ipmi.retry_timeout
ret = ipmicmd.set_power('on', wait) ret = ipmicmd.set_power('on', wait)
except pyghmi_exception.IpmiException as e: except pyghmi_exception.IpmiException as e:
LOG.warning(msg, {'node_id': driver_info['uuid'], 'error': str(e)}) error = msg % {'node_id': driver_info['uuid'], 'error': e}
raise exception.IPMIFailure(cmd=str(e)) LOG.error(error)
raise exception.IPMIFailure(error)
state = ret.get('powerstate') state = ret.get('powerstate')
if state == 'on': if state == 'on':
return states.POWER_ON return states.POWER_ON
else: else:
LOG.warning(msg, {'node_id': driver_info['uuid'], 'error': ret}) error = _("bad response: %s") % ret
raise exception.PowerStateFailure(pstate=state) LOG.error(msg, {'node_id': driver_info['uuid'], 'error': error})
raise exception.PowerStateFailure(pstate=states.POWER_ON)
def _power_off(driver_info): def _power_off(driver_info):
@ -164,8 +166,8 @@ def _power_off(driver_info):
from ipmi. from ipmi.
""" """
msg = _LW("IPMI power off failed for node %(node_id)s with the " msg = _("IPMI power off failed for node %(node_id)s with the "
"following error: %(error)s") "following error: %(error)s")
try: try:
ipmicmd = ipmi_command.Command(bmc=driver_info['address'], ipmicmd = ipmi_command.Command(bmc=driver_info['address'],
userid=driver_info['username'], userid=driver_info['username'],
@ -173,15 +175,17 @@ def _power_off(driver_info):
wait = CONF.ipmi.retry_timeout wait = CONF.ipmi.retry_timeout
ret = ipmicmd.set_power('off', wait) ret = ipmicmd.set_power('off', wait)
except pyghmi_exception.IpmiException as e: except pyghmi_exception.IpmiException as e:
LOG.warning(msg, {'node_id': driver_info['uuid'], 'error': str(e)}) error = msg % {'node_id': driver_info['uuid'], 'error': e}
raise exception.IPMIFailure(cmd=str(e)) LOG.error(error)
raise exception.IPMIFailure(error)
state = ret.get('powerstate') state = ret.get('powerstate')
if state == 'off': if state == 'off':
return states.POWER_OFF return states.POWER_OFF
else: else:
LOG.warning(msg % {'node_id': driver_info['uuid'], 'error': ret}) error = _("bad response: %s") % ret
raise exception.PowerStateFailure(pstate=state) LOG.error(msg, {'node_id': driver_info['uuid'], 'error': error})
raise exception.PowerStateFailure(pstate=states.POWER_OFF)
def _reboot(driver_info): def _reboot(driver_info):
@ -196,8 +200,8 @@ def _reboot(driver_info):
from ipmi. from ipmi.
""" """
msg = _LW("IPMI power reboot failed for node %(node_id)s with the " msg = _("IPMI power reboot failed for node %(node_id)s with the "
"following error: %(error)s") "following error: %(error)s")
try: try:
ipmicmd = ipmi_command.Command(bmc=driver_info['address'], ipmicmd = ipmi_command.Command(bmc=driver_info['address'],
userid=driver_info['username'], userid=driver_info['username'],
@ -205,15 +209,17 @@ def _reboot(driver_info):
wait = CONF.ipmi.retry_timeout wait = CONF.ipmi.retry_timeout
ret = ipmicmd.set_power('boot', wait) ret = ipmicmd.set_power('boot', wait)
except pyghmi_exception.IpmiException as e: except pyghmi_exception.IpmiException as e:
LOG.warning(msg % {'node_id': driver_info['uuid'], 'error': str(e)}) error = msg % {'node_id': driver_info['uuid'], 'error': e}
raise exception.IPMIFailure(cmd=str(e)) LOG.error(error)
raise exception.IPMIFailure(error)
state = ret.get('powerstate') state = ret.get('powerstate')
if state == 'on': if state == 'on':
return states.POWER_ON return states.POWER_ON
else: else:
LOG.warning(msg % {'node_id': driver_info['uuid'], 'error': ret}) error = _("bad response: %s") % ret
raise exception.PowerStateFailure(pstate=state) LOG.error(msg, {'node_id': driver_info['uuid'], 'error': error})
raise exception.PowerStateFailure(pstate=states.REBOOT)
def _power_status(driver_info): def _power_status(driver_info):
@ -231,10 +237,11 @@ def _power_status(driver_info):
password=driver_info['password']) password=driver_info['password'])
ret = ipmicmd.get_power() ret = ipmicmd.get_power()
except pyghmi_exception.IpmiException as e: except pyghmi_exception.IpmiException as e:
LOG.warning(_LW("IPMI get power state failed for node %(node_id)s " msg = (_("IPMI get power state failed for node %(node_id)s "
"with the following error: %(error)s"), "with the following error: %(error)s") %
{'node_id': driver_info['uuid'], 'error': str(e)}) {'node_id': driver_info['uuid'], 'error': e})
raise exception.IPMIFailure(cmd=str(e)) LOG.error(msg)
raise exception.IPMIFailure(msg)
state = ret.get('powerstate') state = ret.get('powerstate')
if state == 'on': if state == 'on':