py-eb-model 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

eb_model/__init__.py

@@ -1,3 +1,4 @@
 from .models import *
 from .parser import *
-from .reporter import *
+from .reporter import *
+from .writer import *

eb_model/cli/pref_system_importer_cli.py

@@ -0,0 +1,75 @@
+import argparse
+import pkg_resources
+import logging
+import sys
+import os.path
+
+from ..writer import TextPreferenceModelWriter
+from ..parser import PerfXdmParser
+from ..models import PreferenceModel
+
+def main():
+    version = pkg_resources.require("py_eb_model")[0].version
+
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help = "Print debug information", action = "store_true")
+    ap.add_argument("--file-list", required=False, help = "Generate the file list (Default)", action = "store_true")
+    ap.add_argument("--ab-project", required=False, help = "Generate the AUTOSAR builder project", action = "store_true")
+    ap.add_argument("--base-path", required=False, help="Base Path for EB tresos")
+    ap.add_argument("INPUTS", nargs='+', help = "The path of perf_imp_xxx.xdm.")
+    ap.add_argument("OUTPUT", help = "The path of output file.")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)s] : %(message)s')
+
+    stdout_handler = logging.StreamHandler(sys.stderr)
+    stdout_handler.setFormatter(formatter)
+
+    base_path = os.path.dirname(args.OUTPUT)
+    log_file = os.path.join(base_path, 'pref_system_importer.log')
+
+    if os.path.exists(log_file):
+        os.remove(log_file)
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    logger.setLevel(logging.DEBUG)
+    file_handler.setLevel(logging.DEBUG)
+
+    if args.verbose:
+        stdout_handler.setLevel(logging.DEBUG)
+    else:
+        stdout_handler.setLevel(logging.INFO)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(stdout_handler)
+
+    format = "file_list"
+    if args.ab_project:
+        format = "ab_project"
+
+    try:
+        doc = PreferenceModel.getInstance()
+
+        parser = PerfXdmParser()
+        for file in args.INPUTS:
+            if args.base_path is not None:
+                file_name = os.path.realpath(os.path.join(args.base_path, file))
+            else:
+                file_name = file
+            parser.parse_preference_xdm(file_name, doc)
+
+        if format == "file_list":
+            writer = TextPreferenceModelWriter()
+            writer.writer_import_files(args.OUTPUT, doc.getSystemDescriptionImporter(), {
+                'base_path': args.base_path,
+                'wildcard':  True,
+            })
+        
+    except Exception as e:
+        logger.error(e)
+        raise e

eb_model/models/__init__.py

@@ -1,3 +1,5 @@
 from .abstract import *
 from .os_xdm import *
+from .rte_xdm import *
 from .eb_doc import *
+from .importer_xdm import *

eb_model/models/eb_doc.py

@@ -1,9 +1,29 @@
+from .importer_xdm import SystemDescriptionImporter
 from .rte_xdm import Rte
 from .os_xdm import Os
 from .abstract import EcucContainer, EcucObject
 
+class AbstractModel(EcucContainer):
+    def getFullName(self):
+        return self.name
+
+    def clear(self):
+        self.elements = {}
+
+    def find_object(self, referred_name:str, element:EcucContainer) -> EcucObject:
+        name_list = referred_name.split("/")
+        #element = EBModel.getInstance()
+        for name in name_list:
+            if (name == ""):
+                continue
+            element = element.getElement(name)
+            if (element == None):
+                return element
+            #    raise ValueError("The %s of reference <%s> does not exist." % (short_name, referred_name))
+        return element
 
-class EBModel(EcucContainer):
+
+class EBModel(AbstractModel):
     __instance = None
 
     @staticmethod
@@ -19,24 +39,9 @@ class EBModel(EcucContainer):
         EcucContainer.__init__(self, None, "")
         EBModel.__instance = self
 
-    def getFullName(self):
-        return self.name
-
-    def clear(self):
-        self.elements = {}
-
     def find(self, referred_name: str) -> EcucObject:
-        name_list = referred_name.split("/")
-        element = EBModel.getInstance()
-        for name in name_list:
-            if (name == ""):
-                continue
-            element = element.getElement(name)
-            if (element == None):
-                return element
-            #    raise ValueError("The %s of reference <%s> does not exist." % (short_name, referred_name))
-        return element
-    
+        return self.find_object(referred_name, EBModel.getInstance())
+
     def getOs(self) -> Os:
         container = EcucContainer(self, "Os")
         os = Os(container)
@@ -46,5 +51,28 @@ class EBModel(EcucContainer):
         container = EcucContainer(self, "Rte")
         rte = Rte(container)
         return self.find("/Rte/Rte")
-    
-    
+
+class PreferenceModel(AbstractModel):
+    __instance = None
+
+    @staticmethod
+    def getInstance():
+        if (PreferenceModel.__instance == None):
+            PreferenceModel()
+        return PreferenceModel.__instance
+
+    def __init__(self):
+        if (PreferenceModel.__instance != None):
+            raise Exception("The PreferenceModel is singleton!")
+        
+        EcucContainer.__init__(self, None, "")
+        PreferenceModel.__instance = self
+
+        container = EcucContainer(self, "ImporterExporterAdditions")
+        SystemDescriptionImporter(container, "SystemDescriptionImporters")
+
+    def find(self, referred_name: str) -> EcucObject:
+        return self.find_object(referred_name, PreferenceModel.getInstance())
+
+    def getSystemDescriptionImporter(self) -> SystemDescriptionImporter:
+        return self.find("/ImporterExporterAdditions/SystemDescriptionImporters")

eb_model/models/importer_xdm.py

@@ -0,0 +1,45 @@
+import glob
+from typing import List
+from .abstract import EcucObject
+import os
+import re
+
+class SystemDescriptionImporter(EcucObject):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.inputFiles = []        # type: List[str]
+
+    def getInputFiles(self):
+        return self.inputFiles
+
+    def addInputFile(self, value):
+        self.inputFiles.append(value)
+        return self
+    
+    def parseWildcard(self, filename: str) -> List[str]:
+        #path: str, file_pattern: str
+        file_list = []
+        for file in glob.iglob(filename):
+            print(file)
+            file_list.append(file)
+        return file_list
+    
+    def getParsedInputFiles(self, base_path: str, wildcard: bool) -> List[str]:
+        file_list = []
+        for input_file in self.inputFiles:
+            if base_path is not None:
+                if wildcard:
+                    m = re.match(r'(.+)\\(\*\.\w+)', input_file)
+                    if m:
+                        path, file_pattern = m.group(1), m.group(2)
+                        #for file_name in self.parseWildcard(os.path.realpath(os.path.join(base_path, path)), file_pattern):
+                        for file_name in self.parseWildcard(os.path.realpath(os.path.join(base_path, input_file))):
+                            file_list.append(file_name)
+                    else:
+                        file_list.append(os.path.realpath(os.path.join(base_path, input_file)))
+                else:
+                    file_list.append(os.path.realpath(os.path.join(base_path, input_file)))
+            else:
+                file_list.append(input_file)
+        return file_list

eb_model/models/os_xdm.py

@@ -159,11 +159,179 @@ class OsAlarm(EcucContainer):
 
         return "\n".join(result)
 
+class OsApplicationHooks(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.OsAppErrorHook = False                                     # type: bool
+        self.OsAppShutdownHook = False                                  # type: bool
+        self.OsAppStartupHook = False                                   # type: bool
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
+
+    def getOsAppErrorHook(self):
+        return self.OsAppErrorHook
+
+    def setOsAppErrorHook(self, value):
+        self.OsAppErrorHook = value
+        return self
+
+    def getOsAppShutdownHook(self):
+        return self.OsAppShutdownHook
+
+    def setOsAppShutdownHook(self, value):
+        self.OsAppShutdownHook = value
+        return self
+
+    def getOsAppStartupHook(self):
+        return self.OsAppStartupHook
+
+    def setOsAppStartupHook(self, value):
+        self.OsAppStartupHook = value
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
+
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+
+class OsApplicationTrustedFunction(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.OsTrustedFunctionName = None                               # type: str
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
+
+    def getOsTrustedFunctionName(self):
+        return self.OsTrustedFunctionName
+
+    def setOsTrustedFunctionName(self, value):
+        self.OsTrustedFunctionName = value
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
 
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+class OsAppMode(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
 class OsApplication(EcucContainer):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
+        self.OsTrusted = False                                          # type: bool
+        self.OsTrustedApplicationDelayTimingViolationCall = False       # type: bool
+        self.OsTrustedApplicationWithProtection = False                 # type: bool
+        self.OsAppAlarmRefs = []                                        # type: List[EcucRefType]
+        self.OsAppCounterRefs = []                                      # type: List[EcucRefType]
+        self.OsAppEcucPartitionRefs = []                                # type: List[EcucRefType]
+        self.OsAppIsrRefs = []                                          # type: List[EcucRefType]
+        self.OsApplicationCoreRefs = []                                 # type: List[EcucRefType]
+        self.OsAppScheduleTableRefs = []                                # type: List[EcucRefType]
+        self.OsAppTaskRefs = []                                         # type: List[EcucRefType]
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
+        self.OsRestartTask = None                                       # type: EcucRefType
+
+        '''
+        EB Tresos
+        '''
+        self.OsAppResourceRefs = []                                     # type: List[EcucRefType] 
+
+    def getOsTrusted(self):
+        return self.OsTrusted
+
+    def setOsTrusted(self, value):
+        self.OsTrusted = value
+        return self
+
+    def getOsTrustedApplicationDelayTimingViolationCall(self):
+        return self.OsTrustedApplicationDelayTimingViolationCall
+
+    def setOsTrustedApplicationDelayTimingViolationCall(self, value):
+        self.OsTrustedApplicationDelayTimingViolationCall = value
+        return self
+
+    def getOsTrustedApplicationWithProtection(self):
+        return self.OsTrustedApplicationWithProtection
+
+    def setOsTrustedApplicationWithProtection(self, value):
+        self.OsTrustedApplicationWithProtection = value
+        return self
+
+    def getOsAppAlarmRefs(self):
+        return self.OsAppAlarmRefs
+
+    def addOsAppAlarmRef(self, value):
+        self.OsAppAlarmRefs.append(value)
+        return self
+
+    def getOsAppCounterRefs(self):
+        return self.OsAppCounterRefs
+
+    def addOsAppCounterRefs(self, value):
+        self.OsAppCounterRefs.append(value)
+        return self
+
+    def getOsAppEcucPartitionRefs(self):
+        return self.OsAppEcucPartitionRefs
+
+    def addOsAppEcucPartitionRefs(self, value):
+        self.OsAppEcucPartitionRefs.append(value)
+        return self
+
+    def getOsAppIsrRefs(self):
+        return self.OsAppIsrRefs
+
+    def addOsAppIsrRefs(self, value):
+        self.OsAppIsrRefs.append(value)
+        return self
+
+    def getOsApplicationCoreRefs(self):
+        return self.OsApplicationCoreRefs
+
+    def addOsApplicationCoreRefs(self, value):
+        self.OsApplicationCoreRefs.append(value)
+        return self
+
+    def getOsAppScheduleTableRefs(self):
+        return self.OsAppScheduleTableRefs
+
+    def addOsAppScheduleTableRef(self, value):
+        self.OsAppScheduleTableRefs.append(value)
+        return self
+
+    def getOsAppTaskRefs(self):
+        return self.OsAppTaskRefs
+
+    def addOsAppTaskRefs(self, value):
+        self.OsAppTaskRefs.append(value)
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
+
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+
+    def getOsRestartTask(self):
+        return self.OsRestartTask
+
+    def setOsRestartTask(self, value):
+        self.OsRestartTask = value
+        return self
+    
+    def getOsAppResourceRefs(self):
+        return self.OsAppResourceRefs
+
+    def addOsAppResourceRef(self, value):
+        self.OsAppResourceRefs.append(value)
+        return self
+
 
 class OsDriver(EcucContainer):
     def __init__(self, parent, name) -> None:
@@ -397,8 +565,14 @@ class OsTaskAutostart(EcucObject):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
-        self.osTaskAppModeRef = None
+        self.osTaskAppModeRefs = []                                     # type: List[EcucRefType]             
 
+    def getOsTaskAppModeRefList(self):
+        return self.osTaskAppModeRefs
+
+    def addOsTaskAppModeRef(self, value):
+        self.osTaskAppModeRefs.append(value)
+        return self
 
 class OsTaskResourceLock(EcucObject):
     def __init__(self, parent, name) -> None:
@@ -434,11 +608,13 @@ class OsTask(EcucObject):
         self.osTaskPeriod = 0.0                         # type: float
         self.osTaskPriority = None                      # type: int
         self.osTaskSchedule = ""
+        self.OsTaskType = None                          # type: str
         self.osStacksize = 0                            # type: int
-        self.osMemoryMappingCodeLocationRef = None
+        self.osMemoryMappingCodeLocationRef = None      # type: EcucRefType
         self.osTaskAccessingApplication = None
-        self.osTaskEventRef = None
+        self.osTaskEventRef = None                      # type: EcucRefType
         self.osTaskResourceRefs = []                    # type: List[EcucRefType]
+        self.osTaskAutostart = None                     # type: OsTaskAutostart
 
     def getOsTaskActivation(self):
         return self.osTaskActivation
@@ -467,6 +643,14 @@ class OsTask(EcucObject):
     def setOsTaskSchedule(self, value):
         self.osTaskSchedule = value
         return self
+    
+    def getOsTaskType(self):
+        return self.OsTaskType
+
+    def setOsTaskType(self, value):
+        self.OsTaskType = value
+        return self
+
 
     def getOsStacksize(self) -> int:
         return self.osStacksize
@@ -507,6 +691,14 @@ class OsTask(EcucObject):
         if self.osTaskSchedule == OsTask.FULL:
             return True
         return False
+    
+    def getOsTaskAutostart(self):
+        return self.osTaskAutostart
+
+    def setOsTaskAutostart(self, value):
+        self.osTaskAutostart = value
+        return self
+
 
 
 class OsScheduleTableAutostart(EcucContainer):
@@ -750,6 +942,7 @@ class Os(EcucContainer):
         self.osAlarms = []                              # type: List[OsAlarm]
         self.osScheduleTables = []                      # type: List[OsScheduleTable]
         self.osCounters = []                            # type: List[OsCounter]
+        self.osApplications = []                        # type: List[OsApplication]
 
     def getOsTaskList(self) -> List[OsTask]:
         return list(sorted(filter(lambda a: isinstance(a, OsTask), self.elements.values()), key=lambda o: o.name))
@@ -789,4 +982,12 @@ class Os(EcucContainer):
     def addOsCounter(self, os_counter: OsCounter):
         self.addElement(os_counter)
         self.osCounters.append(os_counter)
-        return self
+        return self
+    
+    def getOsApplicationList(self) -> List[OsApplication]:
+        return list(sorted(filter(lambda a: isinstance(a, OsApplication), self.elements.values()), key=lambda o: o.name))
+
+    def addOsApplication(self, value):
+        self.addElement(value)
+        self.osApplications.append(value)
+        return self

eb_model/models/rte_xdm.py

@@ -321,7 +321,7 @@ class RteSwComponentInstance(AbstractRteInstance):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
-        self.nappedToOsApplicationRef = None
+        self.mappedToOsApplicationRef = None                # type: EcucRefType
         self.rteSoftwareComponentInstanceRef = None
 
         self.rteEventToIsrMappings = []
@@ -333,10 +333,10 @@ class RteSwComponentInstance(AbstractRteInstance):
         self.rteNvRamAllocations = []
     
     def getMappedToOsApplicationRef(self):
-        return self.nappedToOsApplicationRef
+        return self.mappedToOsApplicationRef
 
     def setMappedToOsApplicationRef(self, value):
-        self.nappedToOsApplicationRef = value
+        self.mappedToOsApplicationRef = value
         return self
 
     def getRteSoftwareComponentInstanceRef(self) -> EcucRefType:
@@ -402,11 +402,11 @@ class RteBswModuleInstance(AbstractRteInstance):
         self.rteBswImplementationRef = None
         self.rteBswModuleConfigurationRefs = []
         self.rteBswEventToIsrMappings = []
-        self.rteBswEventToTaskMappings = []                     # List[RteBswEventToTaskMapping]
+        self.rteBswEventToTaskMappings = []                     # type: List[RteBswEventToTaskMapping]
         self.rteBswExclusiveAreaImpls = []
         self.rteBswExternalTriggerConfigs = []
         self.rteBswInternalTriggerConfigs = []
-        self.rteMappedToOsApplicationRef = None
+        self.rteMappedToOsApplicationRef = None                 # type: EcucRefType
         self.rteBswModeMachineInstanceConfigs = []
         self.rteBswRequiredClientServerConnections = []
         self.rteBswRequiredModeGroupConnections = []
@@ -515,7 +515,7 @@ class Rte(EcucContainer):
         self.elements[value.getName()] = value
 
     def getRteSwComponentInstanceList(self) -> List[RteSwComponentInstance]:
-        return list(sorted(filter(lambda a: isinstance(a, RteBswModuleInstance), self.elements.values()), key= lambda o:o.name))
+        return list(sorted(filter(lambda a: isinstance(a, RteSwComponentInstance), self.elements.values()), key= lambda o:o.name))
 
     def addRteSwComponentInstance(self, value: RteSwComponentInstance):
         self.elements[value.getName()] = value

eb_model/parser/__init__.py

@@ -1 +1,4 @@
 from .os_xdm_parser import OsXdmParser
+from .rte_xdm_parser import RteXdmParser
+from .eb_parser import AbstractEbModelParser
+from .pref_xdm_parser import PerfXdmParser

eb_model/parser/eb_parser.py

@@ -5,7 +5,7 @@ import re
 from abc import ABCMeta
 from typing import List
 
-from ..models.eb_doc import EBModel
+from ..models.eb_doc import EBModel, PreferenceModel
 from ..models.abstract import EcucRefType
 
 class AbstractEbModelParser(metaclass = ABCMeta):
@@ -33,17 +33,17 @@ class AbstractEbModelParser(metaclass = ABCMeta):
         return value
 
     def _convert_value(self, tag):
-        if (tag.attrib['type'] == 'INTEGER'):
-            return int(tag.attrib['value'])
-        elif (tag.attrib['type'] == "FLOAT"):
-            return float(tag.attrib['value'])
-        elif (tag.attrib['type'] == 'BOOLEAN'):
-            if (tag.attrib['value'] == 'true'):
-                return True
-            else:
-                return False
-        else:
-            return tag.attrib['value']
+        if 'type' in tag.attrib:
+            if (tag.attrib['type'] == 'INTEGER'):
+                return int(tag.attrib['value'])
+            elif (tag.attrib['type'] == "FLOAT"):
+                return float(tag.attrib['value'])
+            elif (tag.attrib['type'] == 'BOOLEAN'):
+                if (tag.attrib['value'] == 'true'):
+                    return True
+                else:
+                    return False
+        return tag.attrib['value']
 
     def read_value(self, parent: ET.Element, name: str) -> str:
         tag = parent.find(".//d:var[@name='%s']" % name, self.nsmap)
@@ -165,6 +165,9 @@ class AbstractEbModelParser(metaclass = ABCMeta):
     def parse(self, element: ET.Element, doc: EBModel):
         pass
 
+    def parse_preference(self, element: ET.Element, doc: PreferenceModel):
+        pass
+
     def load_xdm(self, filename: str) -> ET.Element:
         self.logger.info("Loading <%s>" % filename)
 
@@ -177,4 +180,8 @@ class AbstractEbModelParser(metaclass = ABCMeta):
 
     def parse_xdm(self, filename: str, doc: EBModel):
         root_tag = self.load_xdm(filename)
-        self.parse(root_tag, doc)
+        self.parse(root_tag, doc)
+
+    def parse_preference_xdm(self, filename: str, doc: EBModel):
+        root_tag = self.load_xdm(filename)
+        self.parse_preference(root_tag, doc)

eb_model/parser/os_xdm_parser.py

@@ -1,10 +1,9 @@
 import xml.etree.ElementTree as ET
-
 from ..models.eb_doc import EBModel
-from ..models.os_xdm import Os, OsAlarm, OsAlarmActivateTask, OsAlarmCallback, OsAlarmIncrementCounter, OsAlarmSetEvent, OsCounter, OsScheduleTable, OsScheduleTableEventSetting, OsScheduleTableExpiryPoint, OsScheduleTableTaskActivation, OsScheduleTblAdjustableExpPoint, OsTask, OsIsr
+from ..models.os_xdm import Os, OsAlarm, OsAlarmActivateTask, OsAlarmCallback, OsAlarmIncrementCounter, OsAlarmSetEvent, OsCounter, OsScheduleTable, OsScheduleTableEventSetting, OsScheduleTableExpiryPoint, OsScheduleTableTaskActivation, OsScheduleTblAdjustableExpPoint, OsTaskAutostart
+from ..models.os_xdm import OsTask, OsIsr, OsApplication
 from .eb_parser import AbstractEbModelParser
 
-
 class OsXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()
@@ -20,6 +19,15 @@ class OsXdmParser(AbstractEbModelParser):
         self.read_os_alarms(element, os)
         self.read_os_schedule_tables(element, os)
         self.read_os_counters(element, os)
+        self.read_os_applications(element, os)
+
+    def read_os_task_autostart(self, element: ET.Element, os_task: OsTask):
+        ctr_tag = self.find_ctr_tag(element, "OsTaskAutostart")
+        if ctr_tag is not None:
+            autostart = OsTaskAutostart(os_task, ctr_tag.attrib["name"])
+            for app_mode_ref in self.read_ref_value_list(ctr_tag, "OsTaskAppModeRef"):
+                autostart.addOsTaskAppModeRef(app_mode_ref)
+            os_task.setOsTaskAutostart(autostart)
 
     def read_os_tasks(self, element: ET.Element, os: Os):
         for ctr_tag in self.find_ctr_tag_list(element, "OsTask"):
@@ -27,11 +35,14 @@ class OsXdmParser(AbstractEbModelParser):
             os_task.setOsTaskPriority(int(self.read_value(ctr_tag, "OsTaskPriority"))) \
                 .setOsTaskActivation(self.read_value(ctr_tag, "OsTaskActivation")) \
                 .setOsTaskSchedule(self.read_value(ctr_tag, "OsTaskSchedule")) \
+                .setOsTaskType(self.read_value(ctr_tag, "OsTaskType")) \
                 .setOsStacksize(int(self.read_optional_value(ctr_tag, "OsStacksize", 0)))
 
             for resource_ref in self.read_ref_value_list(ctr_tag, "OsTaskResourceRef"):
                 os_task.addOsTaskResourceRef(resource_ref)
 
+            self.read_os_task_autostart(ctr_tag, os_task)
+
             self.logger.debug("Read OsTask <%s>" % os_task.getName())
             os.addOsTask(os_task)
 
@@ -62,7 +73,7 @@ class OsXdmParser(AbstractEbModelParser):
                 .setOsAlarmSetEventTaskRef(self.read_ref_value(element, "OsAlarmSetEventTaskRef"))
         elif chc == "OsAlarmCallback":
             os_alarm_action = OsAlarmCallback(os_alarm, "OsAlarmCallback") \
-                .setOsAlarmCallbackName(self.read_value(os_alarm, "OsAlarmCallbackName"))
+                .setOsAlarmCallbackName(self.read_value(element, "OsAlarmCallbackName"))
         else:
             raise ValueError("Unsupported OsAlarmAction <%s>" % chc)
         os_alarm.setOsAlarmAction(os_alarm_action)
@@ -140,3 +151,14 @@ class OsXdmParser(AbstractEbModelParser):
 
             self.logger.debug("Read OsCounter <%s>" % counter.getName())
             os.addOsScheduleTable(counter)
+
+    def read_os_applications(self, element: ET.Element, os: Os):
+        for ctr_tag in self.find_ctr_tag_list(element, "OsApplication"):
+            os_app = OsApplication(os, ctr_tag.attrib["name"]) \
+                .setOsTrusted(self.read_value(ctr_tag, "OsTrusted")) 
+            
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppResourceRef"):
+                os_app.addOsAppResourceRef(ref)
+
+            self.logger.debug("Read OsApplication <%s>" % os_app.getName())
+            os.addOsApplication(os_app)

eb_model/parser/pref_xdm_parser.py

@@ -0,0 +1,25 @@
+import xml.etree.ElementTree as ET
+import logging
+from ..models.eb_doc import PreferenceModel
+from ..models.importer_xdm import SystemDescriptionImporter
+from . import AbstractEbModelParser
+
+class PerfXdmParser(AbstractEbModelParser):
+    def __init__(self, ) -> None:
+        super().__init__()
+
+        self.logger = logging.getLogger()
+
+    def parse_input_files(self, element: ET.Element, importer: SystemDescriptionImporter):
+        for ctr_tag in self.find_ctr_tag_list(element, "InputFiles"):
+            file_name = self.read_value(ctr_tag, "FileName")
+            self.logger.debug("Add the file <%s>" % file_name)
+            importer.addInputFile(file_name)
+
+    def parse_preference(self, element: ET.Element, doc: PreferenceModel):
+        importer = doc.getSystemDescriptionImporter()
+
+        for ctr_tag in self.find_ctr_tag_list(element, "SystemDescriptionImporters"):
+            self.logger.info("Parse SystemDescriptionImporters: <%s>" % ctr_tag.attrib["name"])
+            self.parse_input_files(ctr_tag, importer)
+            #importer.addInputFile()

eb_model/parser/rte_xdm_parser.py

@@ -4,7 +4,6 @@ from ..models.rte_xdm import Rte, RteBswEventToTaskMapping, RteBswModuleInstance
 from ..models.eb_doc import EBModel
 from .eb_parser import AbstractEbModelParser
 
-
 class RteXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()

eb_model/tests/models/test_eb_model.py

@@ -1,5 +1,5 @@
 import pytest
-from ...models.eb_doc import EBModel
+from ...models.eb_doc import EBModel, PreferenceModel
 
 class TestEBModel:
 
@@ -28,3 +28,16 @@ class TestEBModel:
         document = EBModel.getInstance()
         rte = document.getRte()
         assert (rte.getFullName() == "/Rte/Rte")
+
+class TestPreferenceModel:
+
+    def test_mode_get_system_description_importer(self):
+        document = PreferenceModel.getInstance()
+        importer = document.getSystemDescriptionImporter()
+        assert (importer.getFullName() == "/ImporterExporterAdditions/SystemDescriptionImporters")
+
+        importer = document.find("/ImporterExporterAdditions/SystemDescriptionImporters")
+        assert (importer.getFullName() == "/ImporterExporterAdditions/SystemDescriptionImporters")
+
+        importer = document.getSystemDescriptionImporter()
+        assert (importer.getFullName() == "/ImporterExporterAdditions/SystemDescriptionImporters")

eb_model/writer/__init__.py

@@ -0,0 +1 @@
+from .text_writer import TextPreferenceModelWriter

eb_model/writer/text_writer.py

@@ -0,0 +1,28 @@
+import logging
+from typing import List
+
+from ..models.eb_doc import SystemDescriptionImporter
+
+class TextWriter:
+    def __init__(self):
+        self.logger = logging.getLogger()
+
+    def write(self, filename: str, lines: List[str]):
+        with open(filename, "w") as f_out:
+            for line in lines:
+                f_out.write("%s\n" % line)
+
+class TextPreferenceModelWriter(TextWriter):
+    def __init__(self):
+        super().__init__()
+
+    def writer_import_files(self, filename: str, importer: SystemDescriptionImporter, param = {'base_path': None}):
+        self.logger.info("Generate import files list <%s>" % filename)
+        lines = []
+        for file in sorted(importer.getParsedInputFiles(param['base_path'], param['wildcard'])):
+            if file in lines:
+                self.logger.warning("file <%s> is duplicated." % file)
+            else:
+                lines.append(file)
+
+        self.write(filename, lines)

{py_eb_model-1.0.1.dist-info → py_eb_model-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.0.1
+Version: 1.0.3
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -76,6 +76,13 @@ rte-xdm-xlsx data/Rte.xdm data/Rte.xlsx
 rte-xdm-xlsx -r data/Rte.xdm data/Os.xdm data/Runnable.xlsx
 ```
 
+## 3.3. pref-system-importer
+
+Read the EB preference XDM and generate the file list into text file.
+
+```bash
+pref-system-importer .prefs/pref_imp_exp_Imp_System.xdm data/output.lst --base-path /c/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte
+```
 
 # 4. Change History
 
@@ -89,6 +96,15 @@ rte-xdm-xlsx -r data/Rte.xdm data/Os.xdm data/Runnable.xlsx
 1. Change the attribute to start with lowercase 
 2. *read_ref_value* and *read_optional_ref_value* method returns EcucRefType.
 3. Read the OsScheduleTable and export to excel
-4. REad the OsCounter and export to excel
+4. Read the OsCounter and export to excel
+
+**Version 1.0.2**
+
+1. Fix the setOsAlarmCallbackName bug
+
+**Version 1.0.3**
 
+1. Generate the System import file list based on EB preference Xdm.
+2. Add the support to read OsTaskAutostart element.
+3. Add the support to read OsTaskType element.
 

{py_eb_model-1.0.1.dist-info → py_eb_model-1.0.3.dist-info}/RECORD

@@ -1,17 +1,20 @@
-eb_model/__init__.py,sha256=u3VUin2V_1eExLd9NIpw_LGHIAwaG2vEoyhssZurrvM,69
+eb_model/__init__.py,sha256=oMw5xoAS-lHLxufQSlBIXhGZZMcPmwGFA3PYpTwaQTU,92
 eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/cli/os_xdm_2_xls_cli.py,sha256=lTIYNVDDMIKu6sosjV8I3pLQxD-I11cKjUDXTyKDrLE,1643
+eb_model/cli/pref_system_importer_cli.py,sha256=Disewp4_4Z1xHb_4HqwRj16XVQmAP21MbeVsSuR0uvk,2518
 eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
-eb_model/models/__init__.py,sha256=_WDgFMwl8w3WnI4ZpjHXMdJVdmqPRpwJ8GLMb4_RGk0,71
+eb_model/models/__init__.py,sha256=7_WxCwRdVavLbPzepHWNar3O-rOxhLwmVYWd2pqm2kI,124
 eb_model/models/abstract.py,sha256=4jy328yy2sedIHNwfxjzW3CnVsnTCoskatT8JXjv-rE,2402
-eb_model/models/eb_doc.py,sha256=wWMHdLYpyvmEVlgNLzFLvC8C_uGnlPP4xnx_DlkslY4,1417
-eb_model/models/os_xdm.py,sha256=KouM8Gh4ELl7oQUcgeQ-3Sm1gk4GhTOVZUNt25Rvowo,25163
-eb_model/models/rte_xdm.py,sha256=8nYX567TgOH6BzsgaNOd2WTPGCxETTYXO9MQICrfCfQ,19328
-eb_model/parser/__init__.py,sha256=5qHXKEfEMcE0WvvinJQu_21bNzWFdXTJxUudy-85DEE,40
-eb_model/parser/eb_parser.py,sha256=H5NTDdM0DaGiHsZ6VjaA1pKla5mDePmTDp1jjbeFAbE,7057
+eb_model/models/eb_doc.py,sha256=hPsGdNHlm3vl-ys3B3NGrlJRrWAWPhRvFJrN3fLQTW8,2569
+eb_model/models/importer_xdm.py,sha256=Fnrx-TWKVzJ-kJQr_5DHJhPtEVJ7Ztu5oQZS6_y-UnY,1712
+eb_model/models/os_xdm.py,sha256=HrAhFiPkbkE_YBihG2S5lQTTU9IQla7O15E8guKLDXg,32439
+eb_model/models/rte_xdm.py,sha256=73hBsQ7pUePA9ewFI2d50iImI_FA-jzFQFlnp0K6WTs,19407
+eb_model/parser/__init__.py,sha256=7VOmPr4dng_TrOyDZFu2_s3r0BJZQGiOUxALMY8EnqI,170
+eb_model/parser/eb_parser.py,sha256=XAJZ_agd54C5R4UAAlHfwaVWYFQRSXuTjM_ijcpVU4E,7375
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-eb_model/parser/os_xdm_parser.py,sha256=rczz4YjDzCqNhOb4xAlGLfmWhIMBT9fQ6tSDmIk9kRs,8405
-eb_model/parser/rte_xdm_parser.py,sha256=VbzrowPLpSww8E-Zl--aKTJ9ltHaZ9-wlVGL1nF79FE,4029
+eb_model/parser/os_xdm_parser.py,sha256=xnA1C91Jpd2MGFvdV4Xu03vZLh6IgsUCarEVRmh8_mQ,9635
+eb_model/parser/pref_xdm_parser.py,sha256=khzgD_igMauH7H3OXdFmFc-HspLq8U51wC6CAs6jJHc,1097
+eb_model/parser/rte_xdm_parser.py,sha256=ywAJiBTgI2WifB-rSdoh6PWvRZ4hSSdy4hmdilSTfU0,4027
 eb_model/reporter/__init__.py,sha256=H8D_23UwJi1Ph6yjBfZhxWVbu9ci5_O4471gqXGiZCM,36
 eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
 eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,8 +23,10 @@ eb_model/reporter/excel_reporter/os_xdm.py,sha256=n1e-tU04s0oh3v31OUKgkIju6BUAtC
 eb_model/reporter/excel_reporter/rte_xdm.py,sha256=JweusBQJSg1_jaFbQV3sJnVMALMj3VuEkVf15Pw-Ir4,3936
 eb_model/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eb_model/tests/models/test_eb_model.py,sha256=Xk7RAS4m038IhZ0Y1TQqVoJ-dWgJVIfXVJilWvVzXCw,962
+eb_model/tests/models/test_eb_model.py,sha256=3fpIHhzQlf9KZjm4fZxcSTT4Zio6YhTrcn9UBvlhOfo,1632
 eb_model/tests/models/test_ecuc_container.py,sha256=lZmtXwPMz9T52WFduTgFy16fO2agjSW-Rl2cVypM86s,722
+eb_model/writer/__init__.py,sha256=SE-Kj41HUkVPor7jpNTL3JVPe_9ycmKFWjTFo2VTkTo,50
+eb_model/writer/text_writer.py,sha256=ZSQ6xi-ke41rrchK1474cRNdHRoyj_gucp3GnvZ-ERU,971
 py_eb_model/__init__.py,sha256=u3VUin2V_1eExLd9NIpw_LGHIAwaG2vEoyhssZurrvM,69
 py_eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_eb_model/cli/os_xdm_2_xls_cli.py,sha256=BzeFhyWHbG57qieDNESaXYggszHSy17uwCeXvEfrbCQ,1629
@@ -37,9 +42,9 @@ py_eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtb
 py_eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_eb_model/reporter/excel_reporter/abstract.py,sha256=BOuLhWwwTwqBzErtmwPrelB1iByMfZP9haFmg9ayFQw,1488
 py_eb_model/reporter/excel_reporter/os_xdm.py,sha256=WGMxK0PYxi9J5fUZ-EeiiM8NBpIg2WyxRsrN-gK37YE,1589
-py_eb_model-1.0.1.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.0.1.dist-info/METADATA,sha256=9Z-Evx5Ti6je_cIEhCiwJeYSux4bHJb1ZW5GdCu9wK0,2400
-py_eb_model-1.0.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.0.1.dist-info/entry_points.txt,sha256=vC-sGaF_j37QgkuYsJooGZBN1jnHYWQC4jehliu37fY,119
-py_eb_model-1.0.1.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.0.1.dist-info/RECORD,,
+py_eb_model-1.0.3.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.0.3.dist-info/METADATA,sha256=P8PNKJ-FPWiO9QHD-XRWDNyhOmA-DfPO-G5uxkFfPrQ,2908
+py_eb_model-1.0.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.0.3.dist-info/entry_points.txt,sha256=Kyh2T53j1CnqayX2ZZa7---hLeXK7LidefeO1hJ_EXg,185
+py_eb_model-1.0.3.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.0.3.dist-info/RECORD,,

{py_eb_model-1.0.1.dist-info → py_eb_model-1.0.3.dist-info}/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
 os-xdm-xlsx = eb_model.cli.os_xdm_2_xls_cli:main
+pref-system-importer = eb_model.cli.pref_system_importer_cli:main
 rte-xdm-xlsx = eb_model.cli.rte_xdm_2_xls_cli:main