openstack
/
fuel-web
Code Issues Proposed changes

Fix deployment task serialization on config execute 

Change-Id: I19aef6d6d1fe6578bdf8fd65ea96257033804011
Partial-Bug: #1521929
This commit is contained in:
Alexander Saprykin 2015-12-02 16:39:33 +01:00
parent e8a7c3e9e5
commit adb0b1359d
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nailgun/nailgun/task/task.py
View File

@ -1759,7 +1759,8 @@ class UpdateOpenstackConfigTask(object):
if refreshable_tasks:
orchestrator_graph = deployment_graph.AstuteGraph(task.cluster)
orchestrator_graph.only_tasks(refreshable_tasks)
task_ids = [t['id'] for t in refreshable_tasks]
orchestrator_graph.only_tasks(task_ids)
deployment_tasks = orchestrator_graph.stage_tasks_serialize(
orchestrator_graph.graph.topology, nodes)

36
nailgun/nailgun/test/integration/test_openstack_config_task_manager.py
View File

@ -15,6 +15,7 @@
from mock import patch
from nailgun import consts
from nailgun.orchestrator.tasks_templates import make_generic_task
from nailgun.task.manager import OpenstackConfigTaskManager
from nailgun.test import base
from nailgun.test.base import fake_tasks
@ -40,6 +41,19 @@ class TestOpenstackConfigTaskManager(base.BaseIntegrationTest):
self.cluster = self.env.clusters[0]
self.nodes = self.env.nodes
self.refreshable_task = {
'id': 'test_task',
'type': 'puppet',
'groups': ['primary-controller', 'controller'],
'refresh_on': ['keystone_config'],
'parameters': {},
}
self.release.deployment_tasks = self.release.deployment_tasks + [
self.refreshable_task
]
self.db().flush()
self.env.create_openstack_config(
cluster_id=self.cluster.id,
configuration={
@ -74,21 +88,27 @@ class TestOpenstackConfigTaskManager(base.BaseIntegrationTest):
# 3 tasks for all ready nodes with cluster config
# 1 task for node[0] with node specific config
# 2 tasks (1 per each compute node)
self.assertEqual(len(tasks), 6)
# 1 deployment task
self.assertEqual(len(tasks), 7)
cluster_uids = []
role_uids = []
node_uids = []
deployment_tasks = []
for task in tasks:
self.assertEqual('upload_file', task['type'])
if '/cluster' in task['parameters']['path']:
cluster_uids.extend(task['uids'])
if '/role' in task['parameters']['path']:
role_uids.extend(task['uids'])
if '/node' in task['parameters']['path']:
node_uids.extend(task['uids'])
if task['type'] == 'upload_file':
if '/cluster' in task['parameters']['path']:
cluster_uids.extend(task['uids'])
if '/role' in task['parameters']['path']:
role_uids.extend(task['uids'])
if '/node' in task['parameters']['path']:
node_uids.extend(task['uids'])
else:
deployment_tasks.append(task)
self.assertItemsEqual(cluster_uids, map(str, all_node_ids))
self.assertItemsEqual(role_uids,
[self.nodes[1].uid, self.nodes[2].uid])
self.assertItemsEqual([self.nodes[0].uid], node_uids)
self.assertItemsEqual(deployment_tasks, [
make_generic_task([self.nodes[0].uid], self.refreshable_task)])