openstack
/
senlin
Code Issues Proposed changes

Merge "Fix cluster config updating operation"

This commit is contained in:
Jenkins 2017-07-17 09:39:37 +00:00 committed by Gerrit Code Review
parent 5ef8013b55 8a23231a45
commit eb26b4806d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
senlin/engine/actions/cluster_action.py
View File

@ -253,12 +253,15 @@ class ClusterAction(base.Action):
self.entity.set_status(self.context, consts.CS_ERROR, reason)
return self.RES_ERROR, reason
config = self.inputs.get('config')
name = self.inputs.get('name')
metadata = self.inputs.get('metadata')
timeout = self.inputs.get('timeout')
profile_id = self.inputs.get('new_profile_id')
profile_only = self.inputs.get('profile_only')
if config is not None:
self.entity.config = config
if name is not None:
self.entity.name = name
if metadata is not None:

2
senlin/tests/unit/engine/test_cluster.py
View File

@ -188,6 +188,7 @@ class TestCluster(base.SenlinTestCase):
cluster.timeout = 120
cluster.data = {'FOO': 'BAR'}
cluster.metadata = {'KEY': 'VALUE'}
cluster.config = {'KEY': 'VALUE'}
new_id = cluster.store(self.context)
self.assertEqual(cluster_id, new_id)
@ -206,6 +207,7 @@ class TestCluster(base.SenlinTestCase):
self.assertEqual(120, result.timeout)
self.assertEqual({'FOO': 'BAR'}, result.data)
self.assertEqual({'KEY': 'VALUE'}, result.metadata)
self.assertEqual({'KEY': 'VALUE'}, result.config)
@mock.patch.object(cm.Cluster, '_from_object')
def test_load_via_db_object(self, mock_init):