openstack/ironic
Code Issues Proposed changes

Merge "Add a timeout for powering on/off a node on oneview"

Browse Source
This commit is contained in:
Zuul
2018-01-27 10:58:41 +00:00
committed by Gerrit Code Review
parent 2f85ad321d b47d251152
commit 91561c8835
3 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ironic/drivers/modules/oneview/power.py
View File

@@ -120,12 +120,14 @@ class OneViewPower(base.PowerInterface):
@METRICS.timer('OneViewPower.set_power_state')
@task_manager.require_exclusive_lock
def set_power_state(self, task, power_state):
def set_power_state(self, task, power_state, timeout=None):
"""Turn the current power state on or off.
:param task: a TaskManager instance.
:param power_state: The desired power state POWER_ON, POWER_OFF or
REBOOT from :mod:`ironic.common.states`.
:param timeout: timeout (in seconds) positive integer (> 0) for any
power state. ``None`` indicates to use default timeout.
:raises: InvalidParameterValue if an invalid power state was specified.
:raises: PowerStateFailure if the power couldn't be set to power_state.
:raises: OneViewError if OneView fails setting the power state.
@@ -152,21 +154,26 @@ class OneViewPower(base.PowerInterface):
{'node_uuid': task.node.uuid, 'power_state': power_state})
server_hardware = task.node.driver_info.get('server_hardware_uri')
timeout = (-1 if timeout is None else timeout)
try:
if power_state == states.POWER_ON:
management.set_boot_device(task)
oneview_client.server_hardware.update_power_state(
SET_POWER_STATE_MAP.get(power_state), server_hardware)
SET_POWER_STATE_MAP.get(power_state),
server_hardware, timeout=timeout)
elif power_state == states.REBOOT:
oneview_client.server_hardware.update_power_state(
SET_POWER_STATE_MAP.get(states.POWER_OFF), server_hardware)
SET_POWER_STATE_MAP.get(states.POWER_OFF),
server_hardware, timeout=timeout)
management.set_boot_device(task)
oneview_client.server_hardware.update_power_state(
SET_POWER_STATE_MAP.get(states.POWER_ON), server_hardware)
SET_POWER_STATE_MAP.get(states.POWER_ON),
server_hardware, timeout=timeout)
else:
oneview_client.server_hardware.update_power_state(
SET_POWER_STATE_MAP.get(power_state), server_hardware)
SET_POWER_STATE_MAP.get(power_state),
server_hardware, timeout=timeout)
except client_exception.HPOneViewException as exc:
raise exception.OneViewError(
_("Failed to setting power state on node: %(node)s. "
@@ -177,15 +184,17 @@ class OneViewPower(base.PowerInterface):
@METRICS.timer('OneViewPower.reboot')
@task_manager.require_exclusive_lock
def reboot(self, task):
"""Reboot the node
def reboot(self, task, timeout=None):
"""Reboot the node.
:param task: a TaskManager instance.
:param timeout: timeout (in seconds) positive integer (> 0) for any
power state. ``None`` indicates to use default timeout.
:raises: PowerStateFailure if the final state of the node is not
POWER_ON.
"""
current_power_state = self.get_power_state(task)
if current_power_state == states.POWER_ON:
self.set_power_state(task, states.REBOOT)
self.set_power_state(task, states.REBOOT, timeout=timeout)
else:
self.set_power_state(task, states.POWER_ON)
self.set_power_state(task, states.POWER_ON, timeout=timeout)