openstack/fuel-web
Code Issues Proposed changes

Merge "Serialization of OpenstackConfig configuration_options handled"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 14:45:07 +00:00 committed by Gerrit Code Review
commit 3529f71f3b
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nailgun/nailgun/orchestrator/deployment_serializers.py
View File

@ -807,19 +807,38 @@ class DeploymentLCMSerializer(DeploymentHASerializer90):
def inject_configs(self, node, output):
node_config = output.setdefault('configuration', {})
node_config_opts = output.setdefault('configuration_options', {})
for config in self._configs:
# OpenstackConfig.configuration is MutableDict, so we copy
# data for preventing changes in the DB
config_data = config.configuration.copy()
# TODO(akislitsky) refactor CLI and OpenstackConfig object
# to allow serialize arbitrary data. Old configs data should be
# modified to the structure {'configuration': old_configuration}.
# Then new config data will have the structure:
# {'configuration': old_configuration,
# 'configuration_options': ...,
# 'any_key': any_value
# }
# and new structure will be serialized to the node config.
config_data_opts = config_data.pop('configuration_options', {})
if config.config_type == consts.OPENSTACK_CONFIG_TYPES.cluster:
utils.dict_update(node_config, config.configuration, 1)
utils.dict_update(node_config, config_data, 1)
utils.dict_update(node_config_opts, config_data_opts, 1)
elif config.config_type == consts.OPENSTACK_CONFIG_TYPES.role:
# (asaprykin): objects.Node.all_roles() has a side effect,
# it replaces "<rolename>" with "primary-<rolename>"
# in case of primary role.
for role in node.all_roles:
if NameMatchingPolicy.create(config.node_role).match(role):
utils.dict_update(node_config, config.configuration, 1)
utils.dict_update(node_config, config_data, 1)
utils.dict_update(node_config_opts,
config_data_opts, 1)
elif config.config_type == consts.OPENSTACK_CONFIG_TYPES.node:
if config.node_id == node.id:
utils.dict_update(node_config, config.configuration, 1)
utils.dict_update(node_config, config_data, 1)
utils.dict_update(node_config_opts, config_data_opts, 1)
def inject_provision_info(self, node, data):
# TODO(bgaifullin) serialize_node_info should be reworked

21
nailgun/nailgun/test/integration/test_orchestrator_serializer_90.py
View File

@ -801,6 +801,27 @@ class TestDeploymentLCMSerialization90(
serialized['nodes'][0]['configuration']
)
def test_openstack_configuration_options_in_serialized(self):
conf_options = {
'apply_on_deploy': False
}
self.env.create_openstack_config(
cluster_id=self.cluster_db.id,
configuration={
'glance_config': 'value1',
'nova_config': 'value1',
'ceph_config': 'value1',
'configuration_options': conf_options
}
)
objects.Cluster.prepare_for_deployment(self.cluster_db)
serialized = self.serializer.serialize(self.cluster_db, [self.node])
node_info = serialized['nodes'][0]
self.assertIn('configuration', node_info)
self.assertIn('configuration_options', node_info)
self.assertNotIn('configuration_options', node_info['configuration'])
self.assertEqual(conf_options, node_info['configuration_options'])
def test_cluster_attributes_in_serialized(self):
objects.Cluster.prepare_for_deployment(self.cluster_db)
serialized = self.serializer.serialize(self.cluster_db, [self.node])