openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Fix Sphinx Autodoc WARNING/ERROR in docs build"

Browse Source
This commit is contained in:
Jenkins 2015-04-01 00:39:21 +00:00 committed by Gerrit Code Review
commit a1c87672ea
4 changed files with 47 additions and 37 deletions
ironic_python_agent
api/controllers/v1
base.py
backoff.py
extensions
clean.py
hardware.py

20
ironic_python_agent/api/controllers/v1/base.py

@ -1,16 +1,16 @@
# All Rights Reserved. # All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain # not use this file except in compliance with the License. You may obtain
# a copy of the License at # a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six import six
from wsme import types as wtypes from wsme import types as wtypes
@ -45,7 +45,7 @@ class MultiType(wtypes.UserType):
Used for validating that a value is an instance of one of the types. Used for validating that a value is an instance of one of the types.
:param *types: Variable-length list of types. :param \*types: Variable-length list of types.
""" """
def __init__(self, *types): def __init__(self, *types):

19
ironic_python_agent/backoff.py

@ -60,17 +60,20 @@ class BackOffLoopingCall(loopingcall.LoopingCallBase):
:param initial_delay: delay before first running of function :param initial_delay: delay before first running of function
:param starting_interval: initial interval in seconds between calls to :param starting_interval: initial interval in seconds between calls to
function. When an error occurs and then a success, the interval is function. When an error occurs and then a
returned to starting_interval success, the interval is returned to
:param timeout: time in seconds before a LoopingCallTimeout is raised starting_interval
The call will never take longer than timeout, but may quit before timeout :param timeout: time in seconds before a LoopingCallTimeout is raised.
The call will never take longer than timeout, but may quit
before timeout.
:param max_interval: The maximum interval between calls during errors :param max_interval: The maximum interval between calls during errors
:param jitter: Used to vary when calls are actually run to avoid group of :param jitter: Used to vary when calls are actually run to avoid group of
calls all coming at the exact same time. Uses random.gauss(jitter, calls all coming at the exact same time. Uses
0.1), with jitter as the mean for the distribution. If set below .5, random.gauss(jitter, 0.1), with jitter as the mean for the
it can cause the calls to come more rapidly after each failure. distribution. If set below .5, it can cause the calls to
come more rapidly after each failure.
:raises: LoopingCallTimeout if time spent doing error retries would exceed :raises: LoopingCallTimeout if time spent doing error retries would exceed
timeout. timeout.
""" """
def start(self, initial_delay=None, starting_interval=1, timeout=300, def start(self, initial_delay=None, starting_interval=1, timeout=300,

6
ironic_python_agent/extensions/clean.py

@ -40,12 +40,14 @@ class CleanExtension(base.BaseAgentExtension):
@base.async_command('execute_clean_step') @base.async_command('execute_clean_step')
def execute_clean_step(self, step, node, ports, clean_version=None, def execute_clean_step(self, step, node, ports, clean_version=None,
**kwargs): **kwargs):
"""Execute a clean step """Execute a clean step.
:param step: A clean step with 'step', 'priority' and 'interface' keys :param step: A clean step with 'step', 'priority' and 'interface' keys
:param node: A dict representation of a node :param node: A dict representation of a node
:param ports: A dict representation of ports attached to node :param ports: A dict representation of ports attached to node
:param clean_version: The clean version as returned by :param clean_version: The clean version as returned by
_get_current_clean_version() at the beginning of cleaning/zapping _get_current_clean_version() at the beginning
of cleaning/zapping
:returns: a CommandResult object with command_result set to whatever :returns: a CommandResult object with command_result set to whatever
the step returns. the step returns.
""" """

39
ironic_python_agent/hardware.py

@ -163,30 +163,35 @@ class HardwareManager(object):
def get_clean_steps(self, node, ports): def get_clean_steps(self, node, ports):
"""Get a list of clean steps with priority. """Get a list of clean steps with priority.
Returns a list of dicts of the following form: Returns a list of steps. Each step is represeted by a dict::
{'step': the HardwareManager function to call.
'priority': the order steps will be run in. Ironic will sort all the
clean steps from all the drivers, with the largest priority
step being run first. If priority is set to 0, the step will
not be run during cleaning, but may be run during zapping.
'reboot_requested': Whether the agent should request Ironic reboots
the node via the power driver after the operation completes.
}
Note: multiple hardware managers may return the same step name. The {
priority of the step will be the largest priority of steps with 'step': the HardwareManager function to call.
the same name. The steps will be called using 'priority': the order steps will be run in. Ironic will sort all
`hardware.dispatch_to_managers` and handled by the best suited the clean steps from all the drivers, with the largest
hardware manager. If you need a step to be executed by only your priority step being run first. If priority is set to 0,
hardware manager, ensure it has a unique step name. the step will not be run during cleaning, but may be
run during zapping.
'reboot_requested': Whether the agent should request Ironic reboots
the node via the power driver after the
operation completes.
}
If multiple hardware managers return the same step name, the priority
of the step will be the largest priority of steps with the same name.
The steps will be called using `hardware.dispatch_to_managers` and
handled by the best suited hardware manager. If you need a step to be
executed by only your hardware manager, ensure it has a unique step
name.
`node` and `ports` can be used by other hardware managers to further `node` and `ports` can be used by other hardware managers to further
determine if a clean step is supported for the node. determine if a clean step is supported for the node.
:param node: Ironic node object :param node: Ironic node object
:param ports: list of Ironic port objects :param ports: list of Ironic port objects
:return: a default list of decommission steps, as a list of :return: a list of cleaning steps, where each step is described as a
dictionaries dict as defined above
""" """
return [ return [
{ {