openstack
/
fuel-web
Code Issues Proposed changes

Merge "Set empty list of tasks by default" into stable/newton

This commit is contained in:
Jenkins 2017-03-29 17:26:15 +00:00 committed by Gerrit Code Review
parent 8a42287959 e4290053d9
commit c6a20f8268
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nailgun/nailgun/test/unit/test_transactions_manager.py
View File

@ -52,7 +52,7 @@ class TestMakeAstuteMessage(BaseUnitTest):
lcm_mock.TransactionSerializer.serialize.return_value = (
tasks_directory, tasks_graph, {}
)
result = manager.make_astute_message(tx, context, graph, resolver)
result = manager.make_astute_message(tx, context, graph, resolver, [])
self.assertEqual(
{
'api_version': manager.settings.VERSION['api'],

9
nailgun/nailgun/transactions/manager.py
View File

@ -57,7 +57,7 @@ def _get_node_attributes(graph, kind):
return r
def make_astute_message(transaction, context, graph, node_resolver):
def make_astute_message(transaction, context, graph, node_resolver, all_nodes):
directory, tasks, metadata = lcm.TransactionSerializer.serialize(
context, graph['tasks'], node_resolver
)
@ -72,6 +72,9 @@ def make_astute_message(transaction, context, graph, node_resolver):
metadata['subgraphs'] = subgraphs
objects.DeploymentHistoryCollection.create(transaction, tasks)
for node in all_nodes:
tasks.setdefault(str(node.uid), [])
return {
'api_version': settings.VERSION['api'],
'method': 'task_deploy',
@ -352,7 +355,7 @@ class TransactionsManager(object):
)
for node in nodes:
# set progress to show that node is in progress state
node.progress = 1
node.progress = 0
if not sub_transaction.dry_run:
node.error_type = None
node.error_msg = None
@ -380,7 +383,7 @@ class TransactionsManager(object):
_dump_expected_state(sub_transaction, context.new, graph['tasks'])
message = make_astute_message(
sub_transaction, context, graph, resolver
sub_transaction, context, graph, resolver, nodes
)
objects.Transaction.on_start(sub_transaction)
helpers.TaskHelper.create_action_log(sub_transaction)