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

equal deleted inserted replaced

-:87cfa131b535
+:e7e0ae78773e
 import cone_common
 from cone.public import api, plugin, utils, exceptions
 from cone.confml import persistentconfml
 from cone.storage.filestorage import FileStorage
-import report_util
+from cone.report import report_util
 ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
 VERSION = '1.0'
 'content_report.html',
 'Create a report of the content files in the configuration.'),
 }
 def main():
+""" Get information about project / configurations. """
 shortcut_container = report_util.ReportShortcutContainer(REPORT_SHORTCUTS,
 None)
 parser = OptionParser(version="%%prog %s" % VERSION)
 "the features listed in the setting value report. The first view "\
 "defined in the file will be used.",
 metavar="FILE",
 default=None)
+info_group.add_option("--print-active-root",
+action="store_true",
+help="Print active root in the current project and exit.")
 parser.add_option_group(info_group)
 (options, args) = parser.parse_args()
 cone_common.handle_common_options(options)
+if options.print_active_root:
+print_active_root(options)
+sys.exit(0)
 if not shortcut_container.is_valid_shortcut(options.report_type):
 parser.error("Invalid report type: %s" % options.report_type)
 if (options.report_type or options.template) and \
 (not options.configs and not options.config_wildcards and not options.config_regexes):
 print "Loaded view '%s' from '%s'" % (view.get_name(), options.view_file)
 except ViewLoadError, e:
 print e
 sys.exit(1)
-current = api.Project(api.Storage.open(options.project,"r"))
+current = api.Project(api.Storage.open(options.project,"r", username=options.username, password=options.password))
 print "Opened project in %s" % options.project
 # Get a list of configurations if necessary
 config_list = None
 if options.configs or options.config_wildcards or options.config_regexes:
 report_name)
 data_providers = {'impl_data'   : ImplDataProvider(configs[0], options.impl_filter),
 'api_data'    : ApiDataProvider(configs[0]),
 'content_data': ContentDataProvider(configs[0]),
 'value_data'  : ValueDataProvider(configs, view)}
-report_util.generate_report(template, report, {'data': ReportDataProxy(data_providers)})
+report_util.generate_report(template, report, {'data': ReportDataProxy(data_providers)}, [ROOT_PATH])
 else:
 # Printing configuration info
 config_name = config_list[0]
 config = current.get_configuration(config_name)
 print "Opened configuration %s" % config_name
 configlist.sort()
 for config in configlist:
 print config
 if current: current.close()
+def print_active_root(options):
+storage = api.Storage.open(options.project,"r", username=options.username, password=options.password)
+active_root = storage.get_active_configuration()
+if active_root:
+print "Active root: %s" % active_root
+else:
+print "No active root."
 # ============================================================================
 # Report data proxy and data providers
 # ============================================================================
 def generate_data(self):
 """
 Generate the actual report data. Called when get_data() is called
 the first time.
 """
-raise NotImplmentedError()
+raise NotImplementedError()
 # ----------------------------------------------------------------------------
 class ApiDataProvider(ReportDataProviderBase):
 def __init__(self, config):
 self.type = kwargs['type']
 self.desc = kwargs['desc']
 self.options = kwargs['options']
 class Config(object):
-def __init__(self, path, values):
+def __init__(self, name, path, values, refs):
+self.name = name
 self.path = path
 self.values = values
+self.refs = refs
 class SequenceColumn(object):
 def __init__(self, ref, name, type):
 self.ref = ref
 self.name = name
 try:
 feature = dview.get_feature(entry.ref)
 values[entry.ref] = self._resolve_value(feature)
 except exceptions.NotFound:
 pass
+# Get the feature refs from last layer
-output_configs.append(self.Config(config.get_path(), values))
+last_layer_refs = set(config.get_last_configuration().list_leaf_datas())
+output_configs.append(self.Config(config.get_name(), config.get_path(), values, last_layer_refs))
 # Add a 'modified' attribute to all features
 for group in feature_groups:
 for feature in group.features:
 modified = False
 """Exception raised if _load_view_from_file() fails"""
 pass
 def _load_view_from_file(filename):
 """
-Load the first view from the given ConfML file.
+Load the last view from the given ConfML file.
 @raise ViewLoadError: An error occurred when loading the file.
 """
 file_abspath = os.path.abspath(filename)
 file_dir = os.path.dirname(file_abspath)
 file_name = os.path.basename(file_abspath)

changeset 3	e7e0ae78773e
parent 0	2e8eeb919028
child 4	0951727b8815