9171ce659d
This patch moves _split_command from IronicPythoAgent class to utils module. Also fixes import looping. Change-Id: Ibf2b0b3885286b9ad78db64cf9e195de4ad627ad
54 lines
1.8 KiB
Python
54 lines
1.8 KiB
Python
"""
|
|
Copyright 2013 Rackspace, 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.
|
|
"""
|
|
|
|
import collections
|
|
import ordereddict
|
|
|
|
from ironic_python_agent.openstack.common import gettextutils as gtu
|
|
from ironic_python_agent.openstack.common import log as logging
|
|
from ironic_python_agent.openstack.common import processutils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def get_ordereddict(*args, **kwargs):
|
|
"""A fix for py26 not having ordereddict."""
|
|
try:
|
|
return collections.OrderedDict(*args, **kwargs)
|
|
except AttributeError:
|
|
return ordereddict.OrderedDict(*args, **kwargs)
|
|
|
|
|
|
def execute(*cmd, **kwargs):
|
|
"""Convenience wrapper around oslo's execute() method."""
|
|
result = processutils.execute(*cmd, **kwargs)
|
|
LOG.debug(gtu._('Execution completed, command line is "%s"'),
|
|
' '.join(cmd))
|
|
LOG.debug(gtu._('Command stdout is: "%s"') % result[0])
|
|
LOG.debug(gtu._('Command stderr is: "%s"') % result[1])
|
|
return result
|
|
|
|
|
|
def split_command(command_name):
|
|
command_parts = command_name.split('.', 1)
|
|
if len(command_parts) != 2:
|
|
#NOTE(agordeev): fix to avoid import looping
|
|
from ironic_python_agent import errors
|
|
raise errors.InvalidCommandError(
|
|
'Command name must be of the form <extension>.<name>')
|
|
|
|
return (command_parts[0], command_parts[1])
|