openstack/python-mistralclient
Code Issues Proposed changes

Renaming 'parameters' to 'input'

Browse Source 
Change-Id: Ie20422d97d321a684b25f28068e3a64b77451da6
This commit is contained in:
Renat Akhmerov
2014-09-21 21:57:34 -07:00
parent 30e5150f15
commit b131d60be5
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mistralclient/commands/v2/tasks.py
View File

@@ -152,20 +152,21 @@ class GetResult(command.Command):
self.app.stdout.write(result or "\n") self.app.stdout.write(result or "\n")
class GetParameters(command.Command): class GetInput(command.Command):
"""Show task parameters.""" """Show task input."""
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(GetParameters, self).get_parser(prog_name) parser = super(GetInput, self).get_parser(prog_name)
parser.add_argument( parser.add_argument(
'id', 'id',
help='Task ID') help='Task ID'
)
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
result = tasks.TaskManager(self.app.client)\ result = tasks.TaskManager(self.app.client)\
.get(parsed_args.id).parameters .get(parsed_args.id).input
try: try:
result = json.loads(result) result = json.loads(result)

3
mistralclient/shell.py
View File

@@ -250,9 +250,8 @@ class MistralShell(app.App):
'execution-update': mistralclient.commands.v2.executions.Update, 'execution-update': mistralclient.commands.v2.executions.Update,
'task-list': mistralclient.commands.v2.tasks.List, 'task-list': mistralclient.commands.v2.tasks.List,
'task-get': mistralclient.commands.v2.tasks.Get, 'task-get': mistralclient.commands.v2.tasks.Get,
'task-get-input': mistralclient.commands.v2.tasks.GetInput,
'task-get-output': mistralclient.commands.v2.tasks.GetOutput, 'task-get-output': mistralclient.commands.v2.tasks.GetOutput,
'task-get-parameters':
mistralclient.commands.v2.tasks.GetParameters,
'task-get-result': mistralclient.commands.v2.tasks.GetResult, 'task-get-result': mistralclient.commands.v2.tasks.GetResult,
'task-update': mistralclient.commands.v2.tasks.Update, 'task-update': mistralclient.commands.v2.tasks.Update,
'action-list': mistralclient.commands.v2.actions.List, 'action-list': mistralclient.commands.v2.actions.List,

17
mistralclient/tests/unit/v2/test_cli_tasks.py
View File

@@ -31,19 +31,19 @@ TASK_DICT = {
} }
TASK_RESULT = {"test": "is", "passed": "successfully"} TASK_RESULT = {"test": "is", "passed": "successfully"}
TASK_PARAMETERS = {"param1": "val1", "param2": 2} TASK_INPUT = {"param1": "val1", "param2": 2}
TASK_WITH_RESULT_DICT = TASK_DICT.copy() TASK_WITH_RESULT_DICT = TASK_DICT.copy()
TASK_WITH_RESULT_DICT.update({'result': json.dumps(TASK_RESULT)}) TASK_WITH_RESULT_DICT.update({'result': json.dumps(TASK_RESULT)})
TASK_WITH_OUTPUT_DICT = TASK_DICT.copy() TASK_WITH_OUTPUT_DICT = TASK_DICT.copy()
TASK_WITH_OUTPUT_DICT.update({'output': json.dumps(TASK_RESULT)}) TASK_WITH_OUTPUT_DICT.update({'output': json.dumps(TASK_RESULT)})
TASK_WITH_PARAMETERS_DICT = TASK_DICT.copy() TASK_WITH_INPUT_DICT = TASK_DICT.copy()
TASK_WITH_PARAMETERS_DICT.update({'parameters': json.dumps(TASK_PARAMETERS)}) TASK_WITH_INPUT_DICT.update({'input': json.dumps(TASK_INPUT)})
TASK = tasks.Task(mock, TASK_DICT) TASK = tasks.Task(mock, TASK_DICT)
TASK_WITH_RESULT = tasks.Task(mock, TASK_WITH_RESULT_DICT) TASK_WITH_RESULT = tasks.Task(mock, TASK_WITH_RESULT_DICT)
TASK_WITH_OUTPUT = tasks.Task(mock, TASK_WITH_OUTPUT_DICT) TASK_WITH_OUTPUT = tasks.Task(mock, TASK_WITH_OUTPUT_DICT)
TASK_WITH_PARAMETERS = tasks.Task(mock, TASK_WITH_PARAMETERS_DICT) TASK_WITH_INPUT = tasks.Task(mock, TASK_WITH_INPUT_DICT)
class TestCLIT1asksV2(base.BaseCommandTest): class TestCLIT1asksV2(base.BaseCommandTest):
@@ -94,10 +94,11 @@ class TestCLIT1asksV2(base.BaseCommandTest):
json.dumps(TASK_RESULT, indent=4) + "\n") json.dumps(TASK_RESULT, indent=4) + "\n")
@mock.patch('mistralclient.api.v2.tasks.TaskManager.get') @mock.patch('mistralclient.api.v2.tasks.TaskManager.get')
def test_get_parameters(self, mock): def test_get_input(self, mock):
mock.return_value = TASK_WITH_PARAMETERS mock.return_value = TASK_WITH_INPUT
self.call(task_cmd.GetParameters, app_args=['id']) self.call(task_cmd.GetInput, app_args=['id'])
self.app.stdout.write.assert_called_with( self.app.stdout.write.assert_called_with(
json.dumps(TASK_PARAMETERS, indent=4) + "\n") json.dumps(TASK_INPUT, indent=4) + "\n"
)