py-eb-model 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

eb_model/cli/pref_system_importer_cli.py

@@ -16,7 +16,7 @@ def main():
     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("--base-path", required=True, help="base Path for EB tresos")
     ap.add_argument("--env", required=False, help="specify the environment variable", nargs='+')
     ap.add_argument("--project", required=False, help="specify the project name")
     ap.add_argument("INPUTS", nargs='+', help = "The path of perf_imp_xxx.xdm.")
@@ -60,6 +60,11 @@ def main():
     try:
         doc = PreferenceModel.getInstance()
 
+        params = {}
+        params['base_path'] = args.base_path
+        params['wildcard'] = True
+        params['project'] = args.project
+
         parser = PerfXdmParser()
         for file in args.INPUTS:
             if args.base_path is not None:
@@ -68,10 +73,7 @@ def main():
                 file_name = file
             parser.parse_preference_xdm(file_name, doc)
 
-        params = {}
-        params['base_path'] = args.base_path
-        params['wildcard'] = True
-        params['project'] = args.project
+        parser.add_ecu_extract(doc, params)
 
         if args.env is not None:
             for env in args.env:

eb_model/models/abstract.py

@@ -80,4 +80,60 @@ class EcucRefType:
         m = re.match(r'\/[\w\/]+\/(\w+)', self.value)
         if m:
             return m.group(1)
-        return self.value
+        return self.value
+    
+class Version:
+    def __init__(self):
+        self.majorVersion = None
+        self.minorVersion = None
+        self.patchVersion = None
+
+    def getMajorVersion(self):
+        return self.majorVersion
+
+    def setMajorVersion(self, value):
+        if value is not None:
+            self.majorVersion = value
+        return self
+
+    def getMinorVersion(self):
+        return self.minorVersion
+
+    def setMinorVersion(self, value):
+        if value is not None:
+            self.minorVersion = value
+        return self
+
+    def getPatchVersion(self):
+        return self.patchVersion
+
+    def setPatchVersion(self, value):
+        if value is not None:
+            self.patchVersion = value
+        return self
+    
+    def getVersion(self) -> str:
+        return "%d.%d.%d" % (self.majorVersion, self.minorVersion, self.patchVersion)
+
+class Module(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.arVersion = Version()
+        self.swVersion = Version()
+
+    def getArVersion(self):
+        return self.arVersion
+
+    def setArVersion(self, value):
+        if value is not None:
+            self.arVersion = value
+        return self
+
+    def getSwVersion(self):
+        return self.swVersion
+
+    def setSwVersion(self, value):
+        if value is not None:
+            self.swVersion = value
+        return self

eb_model/models/importer_xdm.py

@@ -18,6 +18,7 @@ class SystemDescriptionImporter(EcucObject):
         return self.inputFiles
 
     def addInputFile(self, value: str):
+        self.logger.debug("Add the file <%s>" % value)
         self.inputFiles.append(value)
         return self
     

eb_model/models/os_xdm.py

@@ -1,7 +1,6 @@
 from typing import List
 
-from ..models.abstract import EcucContainer, EcucObject, EcucRefType
-
+from ..models.abstract import EcucContainer, EcucObject, EcucRefType, Module
 
 class OsAlarmAction(EcucContainer):
     def __init__(self, parent, name) -> None:
@@ -933,7 +932,7 @@ class OsScheduleTable(EcucContainer):
         return self
 
 
-class Os(EcucContainer):
+class Os(Module):
     def __init__(self, parent) -> None:
         super().__init__(parent, "Os")
 

eb_model/models/rte_xdm.py

@@ -1,6 +1,6 @@
+from abc import ABCMeta
 from typing import Dict, List
-from .abstract import EcucContainer, EcucRefType
-
+from ..models.abstract import EcucContainer, EcucRefType, Module
 class RteEventToIsrMapping(EcucContainer):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
@@ -11,8 +11,11 @@ class RteEventToIsrMapping(EcucContainer):
         self.RteRipsFillRoutineRef = None
         self.RteRipsFlushRoutineRef = None
 
-class AbstractEventToTaskMapping(EcucContainer):
+class AbstractEventToTaskMapping(EcucContainer, metaclass = ABCMeta):
     def __init__(self, parent, name) -> None:
+        if type(self) == AbstractEventToTaskMapping:
+            raise ValueError("RteEventToTaskMapping is an abstract class.")
+        
         super().__init__(parent, name)
 
         self.rtePositionInTask = None
@@ -24,8 +27,11 @@ class AbstractEventToTaskMapping(EcucContainer):
         self.rtePositionInTask = value
         return self
 
-class RteEventToTaskMapping(AbstractEventToTaskMapping):
+class RteEventToTaskMapping(AbstractEventToTaskMapping, metaclass = ABCMeta):
     def __init__(self, parent, name) -> None:
+        if type(self) == RteEventToTaskMapping:
+            raise ValueError("RteEventToTaskMapping is an abstract class.")
+
         super().__init__(parent, name)
         
         self.rteActivationOffset = None
@@ -35,7 +41,7 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteServerNumberOfRequestProcessing = None
         self.rteServerQueueLength = None
         self.rteEventPredecessorSyncPointRef = None
-        self.rteEventRef = None
+        
         self.rteEventSuccessorSyncPointRef = None
         self.rteMappedToTaskRef = None
         self.rtePeriod = None
@@ -100,13 +106,6 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteEventPredecessorSyncPointRef = value
         return self
 
-    def getRteEventRef(self) -> EcucRefType:
-        return self.rteEventRef
-
-    def setRteEventRef(self, value: EcucRefType):
-        self.rteEventRef = value
-        return self
-
     def getRteEventSuccessorSyncPointRef(self):
         return self.rteEventSuccessorSyncPointRef
 
@@ -182,7 +181,43 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
 
     def setRteVirtuallyMappedToTaskRef(self, value):
         self.rteVirtuallyMappedToTaskRef = value
-        return self   
+        return self
+    
+    # abstract method
+    def getRteEventRef(self) -> EcucRefType:
+        pass
+    
+class RteEventToTaskMappingV3(RteEventToTaskMapping):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.rteEventRef = None
+
+    def getRteEventRef(self) -> EcucRefType:
+        return self.rteEventRef
+
+    def setRteEventRef(self, value: EcucRefType):
+        self.rteEventRef = value
+        return self
+
+class RteEventToTaskMappingV4(RteEventToTaskMapping):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.rteEventRefs = []
+
+    def getRteEventRefs(self):
+        return self.rteEventRefs
+
+    def addRteEventRef(self, value):
+        if value is not None:
+            self.rteEventRefs.append(value)
+        return self
+    
+    def getRteEventRef(self):
+        if len(self.rteEventRefs) != 1:
+            raise ValueError("Unsupported RteEventRef of RteEventToTaskMapping <%s> " % self.name)
+        return self.rteEventRefs[0]
 
 class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
     def __init__(self, parent, name) -> None:
@@ -196,7 +231,7 @@ class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteBswServerQueueLength = None
         self.rteOsSchedulePoint = None
         self.rteBswEventPredecessorSyncPointRef = None
-        self.rteBswEventRef = None
+       
         self.rteBswMappedToTaskRef = None
         self.rteBswUsedOsAlarmRef = None
         self.rteBswUsedOsEventRef = None
@@ -263,13 +298,6 @@ class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteBswEventPredecessorSyncPointRef = value
         return self
 
-    def getRteBswEventRef(self) -> EcucRefType:
-        return self.rteBswEventRef
-
-    def setRteBswEventRef(self, value: EcucRefType):
-        self.rteBswEventRef = value
-        return self
-
     def getRteBswMappedToTaskRef(self) -> EcucRefType:
         return self.rteBswMappedToTaskRef
 
@@ -312,6 +340,37 @@ class RteBswEventToTaskMapping(AbstractEventToTaskMapping):
         self.rteRipsFlushRoutineRef = value
         return self
 
+class RteBswEventToTaskMappingV3(RteBswEventToTaskMapping):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.rteBswEventRef = None                                      # type: EcucRefType
+
+    def getRteBswEventRef(self):
+        return self.rteBswEventRef
+
+    def setRteBswEventRef(self, value):
+        if value is not None:
+            self.rteBswEventRef = value
+        return self
+
+class RteBswEventToTaskMappingV4(RteBswEventToTaskMapping):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+        
+        self.rteBswEventRefs = []                                       # type: List[EcucRefType]
+
+    def getRteBswEventRefs(self) -> EcucRefType:
+        return self.rteBswEventRefs
+
+    def addRteBswEventRef(self, value: EcucRefType):
+        self.rteBswEventRefs.append(value)
+        return self
+    
+    def getRteBswEventRef(self):
+        if len(self.rteBswEventRefs) != 1:
+            raise ValueError("Unsupported RteEventRef of RteEventToTaskMapping <%s> " % self.name)
+        return self.rteBswEventRefs[0]
 
 class AbstractRteInstance(EcucContainer):
     def __init__(self, parent, name) -> None:
@@ -503,8 +562,8 @@ class RteBswModuleInstance(AbstractRteInstance):
     def setRteMappedToOsApplicationRef(self, value):
         self.rteMappedToOsApplicationRef = value
         return self
-
-class Rte(EcucContainer):
+    
+class Rte(Module):
     def __init__(self, parent) -> None:
         super().__init__(parent, "Rte")
 

eb_model/parser/eb_parser.py

@@ -6,7 +6,7 @@ from abc import ABCMeta
 from typing import List
 
 from ..models.eb_doc import EBModel, PreferenceModel
-from ..models.abstract import EcucRefType
+from ..models.abstract import EcucRefType, Module
 
 class AbstractEbModelParser(metaclass = ABCMeta):
 
@@ -17,10 +17,23 @@ class AbstractEbModelParser(metaclass = ABCMeta):
 
         if type(self) == "AbstractEBModelParser":
             raise ValueError("Abstract EBModelParser cannot be initialized.")
-
+        
     def validate_root(self, element: ET.Element):
         if (element.tag != "{%s}%s" % (self.nsmap[''], "datamodel")):
             raise ValueError("This document <%s> is not EB xdm format" % element.tag)
+        
+    def read_version(self, parent: ET.Element, module: Module):
+        ctr_tag = self.find_ctr_tag(parent, "CommonPublishedInformation")
+        if ctr_tag is not None:
+            ar_version = module.getArVersion()
+            ar_version.setMajorVersion(self.read_value(ctr_tag, "ArMajorVersion"))
+            ar_version.setMinorVersion(self.read_value(ctr_tag, "ArMinorVersion"))
+            ar_version.setPatchVersion(self.read_value(ctr_tag, "ArPatchVersion"))
+
+            sw_version = module.getSwVersion()
+            sw_version.setMajorVersion(self.read_value(ctr_tag, "SwMajorVersion"))
+            sw_version.setMinorVersion(self.read_value(ctr_tag, "SwMinorVersion"))
+            sw_version.setPatchVersion(self.read_value(ctr_tag, "SwPatchVersion"))
 
     def read_ref_raw_value(self, value):
         '''
@@ -32,7 +45,7 @@ class AbstractEbModelParser(metaclass = ABCMeta):
             return match.group(1)
         return value
 
-    def _convert_value(self, tag):
+    def _convert_value(self, tag: ET.Element):
         if 'type' in tag.attrib:
             if (tag.attrib['type'] == 'INTEGER'):
                 return int(tag.attrib['value'])

eb_model/parser/os_xdm_parser.py

@@ -8,12 +8,21 @@ class OsXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()
 
+        self.os = None
+
     def parse(self, element: ET.Element, doc: EBModel):
         if self.get_component_name(element) != "Os":
             raise ValueError("Invalid <%s> xdm file" % "Os")
 
         os = doc.getOs()
 
+        self.read_version(element, os)
+
+        self.logger.info("Parse Rte ARVersion:<%s> SwVersion:<%s>" % 
+                         (os.getArVersion().getVersion(), os.getSwVersion().getVersion()))
+        
+        self.os = os
+
         self.read_os_tasks(element, os)
         self.read_os_isrs(element, os)
         self.read_os_alarms(element, os)
@@ -35,7 +44,7 @@ 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")) \
+                .setOsTaskType(self.read_optional_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"):
@@ -157,8 +166,24 @@ class OsXdmParser(AbstractEbModelParser):
             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, "OsAppAlarmRef"):
+                os_app.addOsAppAlarmRef(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppCounterRef"):
+                os_app.addOsAppCounterRefs(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppScheduleTableRef"):
+                os_app.addOsAppScheduleTableRef(ref)
+            
             for ref in self.read_ref_value_list(ctr_tag, "OsAppResourceRef"):
                 os_app.addOsAppResourceRef(ref)
 
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppTaskRef"):
+                os_app.addOsAppTaskRefs(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppIsrRef"):
+                os_app.addOsAppIsrRefs(ref)
+
+
             self.logger.debug("Read OsApplication <%s>" % os_app.getName())
             os.addOsApplication(os_app)

eb_model/parser/pref_xdm_parser.py

@@ -1,5 +1,6 @@
 import xml.etree.ElementTree as ET
 import logging
+import os
 from ..models.eb_doc import PreferenceModel
 from ..models.importer_xdm import SystemDescriptionImporter
 from . import AbstractEbModelParser
@@ -22,4 +23,14 @@ class PerfXdmParser(AbstractEbModelParser):
         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()
+            #importer.addInputFile()
+
+    def add_ecu_extract(self, doc: PreferenceModel, params = {'base_path': None, 'wildcard': None, "project": None}):
+        importer = doc.getSystemDescriptionImporter()
+
+        #if params['base_path'] is None:
+        #    raise ValueError("Please specify the base path")
+        
+        #ecu_extract_path = os.path.join(params['base_path'], '')
+        
+        importer.addInputFile('systemmod/EcuExtract.arxml')

eb_model/parser/rte_xdm_parser.py

@@ -1,63 +1,93 @@
 import xml.etree.ElementTree as ET
 
-from ..models.rte_xdm import Rte, RteBswEventToTaskMapping, RteBswModuleInstance, RteEventToTaskMapping, RteSwComponentInstance
+from ..models.rte_xdm import Rte, RteBswEventToTaskMapping, RteBswEventToTaskMappingV3, RteBswEventToTaskMappingV4, RteBswModuleInstance, RteEventToTaskMapping, RteEventToTaskMappingV3, RteEventToTaskMappingV4, RteSwComponentInstance
 from ..models.eb_doc import EBModel
-from .eb_parser import AbstractEbModelParser
+from ..parser.eb_parser import AbstractEbModelParser
 
 class RteXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()
+        self.rte = None
 
     def parse(self, element: ET.Element, doc: EBModel):
         if self.get_component_name(element) != "Rte":
             raise ValueError("Invalid <%s> xdm file" % "Rte")
         
-        self.read_rte_bsw_module_instances(element, doc.getRte())
-        self.read_rte_sw_component_instances(element, doc.getRte())
+        rte = doc.getRte()
+        self.read_version(element, rte)
+
+        self.logger.info("Parse Rte ARVersion:<%s> SwVersion:<%s>" % 
+                         (rte.getArVersion().getVersion(), rte.getSwVersion().getVersion()))
+        
+        self.rte = rte
+
+        self.read_rte_bsw_module_instances(element, rte)
+        self.read_rte_sw_component_instances(element, rte)
 
     def read_rte_bsw_module_instance_event_to_task_mappings(self, element: ET.Element, instance: RteBswModuleInstance):
         for ctr_tag in self.find_ctr_tag_list(element, "RteBswEventToTaskMapping"):
-            mapping = RteBswEventToTaskMapping(instance, ctr_tag.attrib['name'])
+            self.logger.debug("Read RteBswEventToTaskMapping <%s>" % ctr_tag.attrib['name'])
+
+            if self.rte.getArVersion().getMajorVersion() >= 4:
+                mapping = RteBswEventToTaskMappingV4(instance, ctr_tag.attrib['name'])
+            else:
+                mapping = RteBswEventToTaskMappingV3(instance, ctr_tag.attrib['name'])
+
             mapping.setRteBswActivationOffset(self.read_optional_value(ctr_tag, "RteBswActivationOffset")) \
                 .setRteBswEventPeriod(self.read_optional_value(ctr_tag, "RteBswPeriod")) \
                 .setRteBswPositionInTask(self.read_optional_value(ctr_tag, "RteBswPositionInTask")) \
-                .setRteBswServerQueueLength(self.read_optional_value(ctr_tag, "RteBswServerQueueLength")) \
-                .setRteBswEventRef(self.read_ref_value(ctr_tag, "RteBswEventRef")) \
-                .setRteBswMappedToTaskRef(self.read_optional_ref_value(ctr_tag, "RteBswMappedToTaskRef"))
+                .setRteBswServerQueueLength(self.read_optional_value(ctr_tag, "RteBswServerQueueLength")) 
+            
+            if isinstance(mapping, RteBswEventToTaskMappingV4):
+                for resource_ref in self.read_ref_value_list(ctr_tag, "RteBswEventRef"):
+                    mapping.addRteBswEventRef(resource_ref)
+            elif isinstance(mapping, RteBswEventToTaskMappingV3):
+                mapping.setRteBswEventRef(self.read_ref_value(ctr_tag, "RteBswEventRef"))
+
+            mapping.setRteBswMappedToTaskRef(self.read_optional_ref_value(ctr_tag, "RteBswMappedToTaskRef"))
             instance.addRteBswEventToTaskMapping(mapping)
         
     def read_rte_bsw_module_instances(self, element: ET.Element, rte: Rte):
         for ctr_tag in self.find_ctr_tag_list(element, 'RteBswModuleInstance'):
+            self.logger.debug("Read RteBswModuleInstance <%s>" % ctr_tag.attrib['name'])
+
             instance = RteBswModuleInstance(rte, ctr_tag.attrib['name'])
             instance.setRteBswImplementationRef(self.read_ref_value(ctr_tag, "RteBswImplementationRef")) \
                 .setRteMappedToOsApplicationRef(self.read_optional_ref_value(ctr_tag, "RteMappedToOsApplicationRef"))
 
             self.read_rte_bsw_module_instance_event_to_task_mappings(ctr_tag, instance)
-            
-            self.logger.debug("Add the RteBswModuleInstance <%s>" % instance.getName())
-
             rte.addRteBswModuleInstance(instance)
 
     def read_rte_sw_component_instance_event_to_task_mappings(self, element: ET.Element, instance: RteSwComponentInstance):
         for ctr_tag in self.find_ctr_tag_list(element, "RteEventToTaskMapping"):
-            mapping = RteEventToTaskMapping(instance, ctr_tag.attrib['name'])
+            
+            if self.rte.getArVersion().getMajorVersion() >= 4:
+                mapping = RteEventToTaskMappingV4(instance, ctr_tag.attrib['name'])
+            else:
+                mapping = RteEventToTaskMappingV3(instance, ctr_tag.attrib['name'])
+
             mapping.setRteActivationOffset(self.read_optional_value(ctr_tag, "RteActivationOffset")) \
                 .setRtePeriod(self.read_optional_value(ctr_tag, "RtePeriod")) \
                 .setRtePositionInTask(self.read_optional_value(ctr_tag, "RtePositionInTask")) \
-                .setRteServerQueueLength(self.read_optional_value(ctr_tag, "RteServerQueueLength")) \
-                .setRteEventRef(self.read_ref_value(ctr_tag, "RteEventRef")) \
-                .setRteMappedToTaskRef(self.read_optional_ref_value(ctr_tag, "RteMappedToTaskRef"))
+                .setRteServerQueueLength(self.read_optional_value(ctr_tag, "RteServerQueueLength")) 
+            
+            if isinstance(mapping, RteEventToTaskMappingV4):
+                for resource_ref in self.read_ref_value_list(ctr_tag, "RteEventRef"):
+                    mapping.addRteEventRef(resource_ref)
+            elif isinstance(mapping, RteEventToTaskMappingV3):
+                mapping.setRteEventRef(self.read_ref_value(ctr_tag, "RteEventRef"))
+
+            mapping.setRteMappedToTaskRef(self.read_optional_ref_value(ctr_tag, "RteMappedToTaskRef"))
             
             instance.addRteEventToTaskMapping(mapping)
 
     def read_rte_sw_component_instances(self, element: ET.Element, rte: Rte):
         for ctr_tag in self.find_ctr_tag_list(element, 'RteSwComponentInstance'):
+            self.logger.debug("Read RteSwComponentInstance <%s>" % ctr_tag.attrib['name'])
+
             instance = RteSwComponentInstance(rte, ctr_tag.attrib['name'])
             instance.setMappedToOsApplicationRef(self.read_optional_ref_value(ctr_tag, "MappedToOsApplicationRef")) \
                 .setRteSoftwareComponentInstanceRef(self.read_optional_ref_value(ctr_tag, "RteSoftwareComponentInstanceRef"))
             
             self.read_rte_sw_component_instance_event_to_task_mappings(ctr_tag, instance)
-            
-            self.logger.debug("Add the RteSwComponentInstance <%s>" % instance.getName())
-
             rte.addRteSwComponentInstance(instance)

eb_model/reporter/excel_reporter/rte_xdm.py

@@ -62,7 +62,7 @@ class RteRunnableEntityXlsWriter(ExcelReporter):
                 if isinstance(mapping, RteBswEventToTaskMapping):
                     self.logger.debug("Write Mapping %s" % mapping.getName())
                     instance = mapping.getRteBswModuleInstance()
-                    self.write_cell(sheet, row, 2, mapping.getRteBswEventRef().getShortName())
+                    self.write_cell(sheet, row, 2, mapping.getRteBswEventRefs().getShortName())
                     self.write_cell(sheet, row, 5, instance.getRteBswImplementationRef().getValue())
                     self.write_cell(sheet, row, 6, mapping.getRteBswPositionInTask())
                     self.write_cell(sheet, row, 7, mapping.getRteBswActivationOffset())

eb_model/writer/project_writer.py

@@ -2,6 +2,7 @@ from typing import List
 from xml.dom import minidom
 import xml.etree.ElementTree as ET
 import logging
+import os
 
 from ..models.eclipse_project import Link
 from ..models.importer_xdm import SystemDescriptionImporter
@@ -62,7 +63,6 @@ class ABProjectWriter(EclipseProjectWriter):
 
         with open(filename, "w", encoding="utf-8") as f_out:
             f_out.write(xml.decode())
-        
 
     def writer_import_files(self, filename: str, importer: SystemDescriptionImporter, params = {'base_path': None, 'wildcard': None, "project": None}):
         self.logger.info("Generate AB project <%s>" % filename)

{py_eb_model-1.1.0.dist-info → py_eb_model-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.1.0
+Version: 1.1.2
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -178,7 +178,14 @@ PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rt
 2. Add the support to read OsTaskAutostart element.
 3. Add the support to read OsTaskType element.
 
-**Version 1.1.0**
+**Version 1.1.1**
+
+1. Add the support to append SystemMod/EcuExtract.arxml into list automatically for PrefSystemImporter.
+
+**Version 1.1.2**
+
+1. Read the OsAppTaskRef from OsApplication.
+
 
 
 

{py_eb_model-1.1.0.dist-info → py_eb_model-1.1.2.dist-info}/RECORD

@@ -1,34 +1,34 @@
 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=M46tHz97GTTud0dCtOhFVZ04B3yzThBmix7OSg00K_c,3315
+eb_model/cli/pref_system_importer_cli.py,sha256=Cra-rVpgxruLLyWHRdYAgbwfcHVPV2L8Jk6ck0v4lJU,3361
 eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
 eb_model/models/__init__.py,sha256=7_WxCwRdVavLbPzepHWNar3O-rOxhLwmVYWd2pqm2kI,124
-eb_model/models/abstract.py,sha256=9Bvz75pwvSv1Txt68t-01zErY78aWrlis390Mzmfvvw,2394
+eb_model/models/abstract.py,sha256=uavSXSfKeM2JvOLmpBh43WlYLQ5fCk_F99tf9YVHDkU,3833
 eb_model/models/eb_doc.py,sha256=hPsGdNHlm3vl-ys3B3NGrlJRrWAWPhRvFJrN3fLQTW8,2569
 eb_model/models/eclipse_project.py,sha256=W6ovTd3SMnlmWm_efVBZqTUGQebF0hJocsTqMlQ7_XQ,169
-eb_model/models/importer_xdm.py,sha256=tnd-9Smcd_vLs5t9wb7ob-i-nykUF7xUesf4zxmB4wA,4193
-eb_model/models/os_xdm.py,sha256=HrAhFiPkbkE_YBihG2S5lQTTU9IQla7O15E8guKLDXg,32439
-eb_model/models/rte_xdm.py,sha256=73hBsQ7pUePA9ewFI2d50iImI_FA-jzFQFlnp0K6WTs,19407
+eb_model/models/importer_xdm.py,sha256=B2Vqw5nkmzFgaGSpZlmTVFWZ88rTMqD8Iryytg4kUnk,4249
+eb_model/models/os_xdm.py,sha256=2Y6PJ_IMrXjC6oSK_k3vtZpH8P31GlJhfNv18zbPFQg,32438
+eb_model/models/rte_xdm.py,sha256=kCn5WTrBY3nwMCYYaaWuoO6jWy37BmzNycTnVXnMDvQ,21482
 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.py,sha256=_5sUl2pMt1SchHvrLOhU2axqa3FmKTWElSB79taz0O4,8188
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-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/parser/os_xdm_parser.py,sha256=ZBS36hcnMufCsiypnx-wmWmHYuECOqRWGOjOHbqXjBc,10560
+eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
+eb_model/parser/rte_xdm_parser.py,sha256=nUqlVMBJVxMGb3yENFBm1RB9jWQ7azhMKhGkfLfz4K0,5459
 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
 eb_model/reporter/excel_reporter/abstract.py,sha256=PfIoiKNKy1eRJBABln7rADkSdwWzS03Vs03jBYM-_5Y,1622
 eb_model/reporter/excel_reporter/os_xdm.py,sha256=n1e-tU04s0oh3v31OUKgkIju6BUAtCwb7iGtp2j4Hsc,5578
-eb_model/reporter/excel_reporter/rte_xdm.py,sha256=JweusBQJSg1_jaFbQV3sJnVMALMj3VuEkVf15Pw-Ir4,3936
+eb_model/reporter/excel_reporter/rte_xdm.py,sha256=OHuVPUV7xCdDzxELyXi766YJ6GejTHrzPrlAUBqexIw,3937
 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=3fpIHhzQlf9KZjm4fZxcSTT4Zio6YhTrcn9UBvlhOfo,1632
 eb_model/tests/models/test_ecuc_container.py,sha256=lZmtXwPMz9T52WFduTgFy16fO2agjSW-Rl2cVypM86s,722
 eb_model/tests/models/test_importer_xdm.py,sha256=F80kO77jeyfCkLPRgRLjEj3UPcrACimR5LhBhFgX_m4,3372
 eb_model/writer/__init__.py,sha256=CXvQAsNV1OvYClkHdKCG7Q300OVBzcl2TmoD68MyQOs,95
-eb_model/writer/project_writer.py,sha256=umFx3M-VccqzKRAfGzrbYJwo_n0eCvjpZUbQOfbg0QE,2799
+eb_model/writer/project_writer.py,sha256=9BQU1CJAktVxFvQk89Pj4IbizTJXnlQidt4eX_CIFXU,2800
 eb_model/writer/text_writer.py,sha256=7d4_PUTJk5Y6S_EQflAH3ACDnUw9VwJzP90GFDh0n0I,991
 py_eb_model/__init__.py,sha256=u3VUin2V_1eExLd9NIpw_LGHIAwaG2vEoyhssZurrvM,69
 py_eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,9 +45,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.1.0.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.1.0.dist-info/METADATA,sha256=3eIiugWxfU5Qlgi0vCYMR9UACd5NZcR85o_vU3JIwsA,5759
-py_eb_model-1.1.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.1.0.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
-py_eb_model-1.1.0.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.1.0.dist-info/RECORD,,
+py_eb_model-1.1.2.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.2.dist-info/METADATA,sha256=3LOAFETww4ZvsasY7bi0uG8-Pehw6bYpn9KHTLslkVI,5937
+py_eb_model-1.1.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.2.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
+py_eb_model-1.1.2.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.2.dist-info/RECORD,,