FCL/sftools/depl/swconfigmdw: comparison configurationengine/source/scripts/conesub

equal deleted inserted replaced

-:87cfa131b535
+:e7e0ae78773e
 # Include all added configurations
 for confml_path in confml_resources:
 if confml_path not in already_included:
 print "Including %s in layer root %s" % (confml_path, targetconfig.path)
 targetconfig.include_configuration(confml_path)
+merge_metadata(sourceconfig, targetconfig)
 def find_layers_to_merge(layer_indices, rename, sourceconfig, targetconfig):
 """
 Return a list of layers to merge.
 return result
 def sort_mergeconfigs(layers, sourceconfigs):
 """
 Return a correctly sorted list of source configuration layers.
-@param layers: List of the indices of the layers to merg. Can be None, in
+@param layers: List of the indices of the layers to merge. Can be None, in
 which case all layers are returned.
 @param sourceconfigs: List of all configuration layer root paths in the
 source project.
 @return: List of configuration layer root paths.
 """
 for layer in layers:
 sorted_configs[layer]=sourceconfigs[layer]
 sorted_configs = filter(lambda x: x != None, sorted_configs)
 return sorted_configs
+def merge_metadata(source_config, target_config):
+# Merge (well, replace) configuration meta-data
+if source_config.meta:
+target_config.meta = source_config.meta._clone(recursion=True)
+else:
+del target_config.meta
+def get_active_root_if_necessary(project, configuration, name):
+if configuration:
+return configuration
+else:
+active_root = project.get_storage().get_active_configuration()
+if active_root == "":
+raise MergeFailedException("No %s configuration given and the project does not have an active root" % name)
+else:
+return active_root
 def merge_config_root_to_config_root(source_project, target_project,
 source_config, target_config,
-layer_indices, rename,
+layer_finder_func,
 merge_policy):
 """
 Merge the source configuration root to the target configuration root.
-@param layer_indices: List of layer indices to specify the layers
-to merge, can be None.
+@param source_config: Name of the source configuration.
-@param rename: If True, the merged layers are renamed based on the
+@param target_config: Name of the target configuration.
-name of the target configuration root.
+@param layer_finder_func: Function for finding the layers that are to be
+merged. It should take source and target configuration objects as
+arguments and return a list of tuples (layer_root, target_layer_root),
+where layer_root is the path to the layer root in the source
+configuration and target_layer_root the one in the target
+configuration.
 @param merge_policy: The used merge policy.
 """
-def get_active_root_if_necessary(project, configuration, name):
-if configuration:
-return configuration
-else:
-active_root = project.get_storage().get_active_configuration()
-if active_root == "":
-raise MergeFailedException("No %s configuration given and the project does not have an active root" % name)
-else:
-return active_root
 target_root = get_active_root_if_necessary(target_project, target_config, 'target')
 source_root = get_active_root_if_necessary(source_project, source_config, 'source')
 print "Target config:  %s" % target_root
 print "Source config:  %s" % source_root
 else:
 logger.info('Creating new layer %s to root %s' % (sourcelayer_path, target_config.path))
 target_config.create_configuration(sourcelayer_path)
 # Collect a correctly sorted list of all layer paths to merge
-layers_to_merge = find_layers_to_merge(
+layers_to_merge = layer_finder_func(source_config, target_config)
-layer_indices   = layer_indices,
-rename          = rename,
-sourceconfig    = source_config,
-targetconfig    = target_config)
 print "Merging %d layer(s)..." % len(layers_to_merge)
 # Merge the layers
 for source_path, target_path in layers_to_merge:
 except exceptions.NotFound:
 logger.info('Creating new layer configuration %s' % (target_path))
 target_layer = target_config.create_configuration(target_path)
 merge_configuration_layer(source_layer, target_layer, merge_policy)
+merge_metadata(source_config, target_config)
 def main(argv=sys.argv):
+""" Merge a configuration/layer to the project. """
 parser = OptionParser(version="%%prog %s" % VERSION)
 parser.add_options(cone_common.COMMON_OPTIONS)
 parser.add_option("-c", "--configuration",\
 # Merging a configuration root into a configuration root
 if options.all: layer_indices = None
 else:           layer_indices = utils.distinct_array(options.layers)
+def find_layers(source_config, target_config):
+return find_layers_to_merge(
+layer_indices   = layer_indices,
+rename          = options.rename,
+sourceconfig    = source_config,
+targetconfig    = target_config)
 merge_config_root_to_config_root(
-source_project = source_project,
+source_project      = source_project,
-target_project = target_project,
+target_project      = target_project,
-source_config  = options.sourceconfiguration,
+source_config       = options.sourceconfiguration,
-target_config  = options.configuration,
+target_config       = options.configuration,
-layer_indices  = layer_indices,
+layer_finder_func   = find_layers,
-rename         = options.rename,
+merge_policy        = options.merge_policy)
-merge_policy   = options.merge_policy)
 except MergeFailedException, e:
 print "Could not merge: %s" % e
 sys.exit(2)
 else:
 # Merge successful, so save the target configuration and project
 source_project.close()
 if __name__ == "__main__":
 main()

changeset 3	e7e0ae78773e
parent 0	2e8eeb919028
child 5	d2c80f5cab53