openstack
/
python-ironicclient
Code Issues Proposed changes

Merge "Refactor provision state so all actions can use inherited take_action"

This commit is contained in:
Jenkins 2016-10-16 16:51:27 +00:00 committed by Gerrit Code Review
parent 479941e49a cfe4021e0f
commit b12261f3e1
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ironicclient/osc/v1/baremetal_node.py
View File

@ -54,9 +54,19 @@ class ProvisionStateBaremetalNode(command.Command):
baremetal_client = self.app.client_manager.baremetal
clean_steps = getattr(parsed_args, 'clean_steps', None)
if clean_steps == '-':
clean_steps = utils.get_from_stdin('clean steps')
if clean_steps:
clean_steps = utils.handle_json_or_file_arg(clean_steps)
config_drive = getattr(parsed_args, 'config_drive', None)
baremetal_client.node.set_provision_state(
parsed_args.node,
parsed_args.provision_state)
parsed_args.provision_state,
configdrive=config_drive,
cleansteps=clean_steps)
class AbortBaremetalNode(ProvisionStateBaremetalNode):
@ -169,21 +179,6 @@ class CleanBaremetalNode(ProvisionStateBaremetalNode):
"optional key 'args'."))
return parser
def take_action(self, parsed_args):
self.log.debug("take_action(%s)", parsed_args)
baremetal_client = self.app.client_manager.baremetal
clean_steps = parsed_args.clean_steps
if parsed_args.clean_steps == '-':
clean_steps = utils.get_from_stdin('clean steps')
if clean_steps:
clean_steps = utils.handle_json_or_file_arg(clean_steps)
baremetal_client.node.set_provision_state(
parsed_args.node,
parsed_args.provision_state,
cleansteps=clean_steps)
class ConsoleDisableBaremetalNode(command.Command):
"""Disable console access for a node"""
@ -395,16 +390,6 @@ class DeployBaremetalNode(ProvisionStateBaremetalNode):
"a directory, a config drive will be generated from it. "))
return parser
def take_action(self, parsed_args):
self.log.debug("take_action(%s)", parsed_args)
baremetal_client = self.app.client_manager.baremetal
baremetal_client.node.set_provision_state(
parsed_args.node,
parsed_args.provision_state,
configdrive=parsed_args.config_drive)
class InspectBaremetalNode(ProvisionStateBaremetalNode):
"""Set provision state of baremetal node to 'inspect'"""

5
ironicclient/tests/unit/osc/v1/test_baremetal_node.py
View File

@ -55,7 +55,7 @@ class TestAdopt(TestBaremetal):
self.cmd.take_action(parsed_args)
self.baremetal_mock.node.set_provision_state.assert_called_once_with(
'node_uuid', 'adopt')
'node_uuid', 'adopt', cleansteps=None, configdrive=None)
class TestBootdeviceSet(TestBaremetal):
@ -935,7 +935,8 @@ class TestDeployBaremetalProvisionState(TestBaremetal):
self.cmd.take_action(parsed_args)
self.baremetal_mock.node.set_provision_state.assert_called_once_with(
'node_uuid', 'active', configdrive='path/to/drive')
'node_uuid', 'active',
cleansteps=None, configdrive='path/to/drive')
def test_deploy_baremetal_provision_state_mismatch(self):
arglist = ['node_uuid',