324f037eb0
sync_command and async_command in ironic_python_agent/extensions/base.py
are implemented so that they change decorated method signature,
which is really bad practice. Example:
@sync_command
def orig_method(self, **kw):
...
sync_command decorator returns lambda which has one additional
argument 'command_name'
def sync_command(func):
def decorated(self, command_name, **kw):
...
func(self, **kw)
...
return decorated
Additional parameter 'command_name' is moved from decorated function to
decorator signature in both decorators. Every call of decorated functions
is fixed, BaseAgentExtension.execute is updated to not send this extra
argument. BaseAgentExtension.__init__ automatically generates command_map
from decorated methods.
Change-Id: Iff0f495bc8d9c731892feb0f4759a7f10ee76328
Closes-Bug: 1314148
46 lines
1.8 KiB
Python
46 lines
1.8 KiB
Python
# Copyright 2014 Mirantis, Inc.
|
|
#
|
|
# 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 a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from ironic_python_agent import errors
|
|
from ironic_python_agent.extensions import base
|
|
from ironic_python_agent.openstack.common import log
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
def _validate_exts(ext, flow=None):
|
|
for task in flow:
|
|
for method in task:
|
|
ext_name, cmd = ext.split_command(method)
|
|
if ext_name not in ext.ext_mgr.names():
|
|
raise errors.RequestedObjectNotFoundError('Extension',
|
|
ext_name)
|
|
ext_obj = ext.ext_mgr[ext_name].obj
|
|
ext.check_cmd_presence(ext_obj, ext_name, cmd)
|
|
|
|
|
|
class FlowExtension(base.BaseAgentExtension, base.ExecuteCommandMixin):
|
|
@base.async_command('start_flow', _validate_exts)
|
|
def start_flow(self, flow=None):
|
|
for task in flow:
|
|
for method, params in task.items():
|
|
LOG.info("Executing method %s for now" % method)
|
|
result = self.execute_command(method, **params)
|
|
result.join()
|
|
LOG.info("%s method's execution is done" % method)
|
|
if result.command_status == base.AgentCommandStatus.FAILED:
|
|
raise errors.CommandExecutionError(
|
|
"%s was failed" % method
|
|
)
|