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

eb_model/cli/pref_system_importer_cli.py

@@ -3,8 +3,9 @@ import pkg_resources
 import logging
 import sys
 import os.path
+import re
 
-from ..writer import TextPreferenceModelWriter
+from ..writer import TextPreferenceModelWriter, ABProjectWriter
 from ..parser import PerfXdmParser
 from ..models import PreferenceModel
 
@@ -12,10 +13,12 @@ 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("-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=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.")
     ap.add_argument("OUTPUT", help = "The path of output file.")
 
@@ -34,18 +37,20 @@ def main():
     if os.path.exists(log_file):
         os.remove(log_file)
 
-    file_handler = logging.FileHandler(log_file)
-    file_handler.setFormatter(formatter)
+    if args.verbose:
+        file_handler = logging.FileHandler(log_file)
+        file_handler.setFormatter(formatter)
+        file_handler.setLevel(logging.DEBUG)
 
     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)
+    
+    if args.verbose:
+        logger.addHandler(file_handler)
     logger.addHandler(stdout_handler)
 
     format = "file_list"
@@ -55,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:
@@ -63,12 +73,21 @@ def main():
                 file_name = file
             parser.parse_preference_xdm(file_name, doc)
 
+        parser.add_ecu_extract(doc, params)
+
+        if args.env is not None:
+            for env in args.env:
+                m = re.match(r'(\w+)=([:\/\\\.\w]+)', env)
+                if m:
+                    params["env_var:%s" % m.group(1)] = m.group(2)
+        #params['tresos_output_base_dir'] = args.TRESOS_OUTPUT_BASE_DIR
+
         if format == "file_list":
             writer = TextPreferenceModelWriter()
-            writer.writer_import_files(args.OUTPUT, doc.getSystemDescriptionImporter(), {
-                'base_path': args.base_path,
-                'wildcard':  True,
-            })
+            writer.writer_import_files(args.OUTPUT, doc.getSystemDescriptionImporter(), params)
+        elif format == "ab_project":
+            writer = ABProjectWriter()
+            writer.writer_import_files(args.OUTPUT, doc.getSystemDescriptionImporter(), params)
         
     except Exception as e:
         logger.error(e)

eb_model/models/abstract.py

@@ -1,8 +1,7 @@
 from abc import ABCMeta
-from typing import Dict, List
+from typing import Dict
 import re
 
-
 class EcucObject(metaclass=ABCMeta):
     def __init__(self, parent, name) -> None:
         if type(self) == EcucObject:
@@ -81,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/eclipse_project.py

@@ -0,0 +1,8 @@
+
+class Link:
+    def __init__(self, name, type, locationURI):
+        self.name = name
+        self.type = type
+        self.locationURI = locationURI
+
+        

eb_model/models/importer_xdm.py

@@ -1,45 +1,115 @@
+from typing import Dict, List
+
+from ..models.eclipse_project import Link
+from ..models.abstract import EcucObject
 import glob
-from typing import List
-from .abstract import EcucObject
 import os
 import re
+import logging
 
 class SystemDescriptionImporter(EcucObject):
     def __init__(self, parent, name):
         super().__init__(parent, name)
-
+        
+        self.logger = logging.getLogger()
         self.inputFiles = []        # type: List[str]
 
     def getInputFiles(self):
         return self.inputFiles
 
-    def addInputFile(self, value):
+    def addInputFile(self, value: str):
+        self.logger.debug("Add the file <%s>" % 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)
+        for file in glob.iglob(filename, recursive=True):
             file_list.append(file)
         return file_list
     
-    def getParsedInputFiles(self, base_path: str, wildcard: bool) -> List[str]:
+    def getParsedInputFiles(self, params = {}) -> List[str]:
         file_list = []
         for input_file in self.inputFiles:
-            if base_path is not None:
-                if wildcard:
+            m = re.match(r'\$\{(env_var:\w+)\}(.*)', input_file)
+            if m and m.group(1) in params:
+                old_input_file = input_file
+                input_file = params[m.group(1)] + m.group(2)
+                self.logger.info("Replace Environment Variable Path: %s => %s" % (old_input_file, os.path.realpath(input_file)))
+            if params['base_path'] is not None:
+                if params['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))):
+                        for file_name in self.parseWildcard(os.path.realpath(os.path.join(params['base_path'], input_file))):
                             file_list.append(file_name)
                     else:
-                        file_list.append(os.path.realpath(os.path.join(base_path, input_file)))
+                        file_list.append(os.path.realpath(os.path.join(params['base_path'], input_file)))
                 else:
-                    file_list.append(os.path.realpath(os.path.join(base_path, input_file)))
+                    file_list.append(os.path.realpath(os.path.join(params['base_path'], input_file)))
             else:
                 file_list.append(input_file)
-        return file_list
+        return file_list
+    
+    def getAllPaths(self, path :str) -> List[str]:
+        path_segments = path.split("/")
+
+        result = []
+        long_path = ""
+        for path_segment in path_segments:
+            if path_segment == "..":
+                continue
+            if long_path == "":
+                long_path = path_segment
+            else:
+                long_path = long_path +"/" + path_segment
+            result.append(long_path)
+        return result
+    
+    def getNameByPath(self, path : str):              
+        path_segments = path.split("/")
+
+        result = []
+        count = 0
+        for path_segment in path_segments:
+            if path_segment == "..":
+                count += 1
+            else:
+                result.append(path_segment)
+        
+        return (count , "/".join(result))
+    
+    def getLinks(self, file_list: List[str]) -> List[Link]:
+        path_sets = {}             # type: Dict[str, List[str]] 
+        path_segment_sets = []
+
+        for file in file_list:
+            path, basename = os.path.split(file)
+            path = os.path.relpath(path).replace("\\", "/")
+            if path not in path_sets:
+                path_sets[path] = []
+            
+            # To avoid the duplicate file
+            if basename not in path_sets[path]:
+                path_sets[path].append(basename)
+
+        links = []
+        for name in path_sets:
+            for path_segment in self.getAllPaths(name):
+                if path_segment not in path_sets:
+                    if path_segment not in path_segment_sets:
+                        path_segment_sets.append(path_segment)
+        
+        for segment in path_segment_sets:
+            link = Link(segment, 2, "virtual:/virtual")
+            links.append(link)
+        
+        for path_set in path_sets:
+            for basename in path_sets[path_set]:
+                path = os.path.relpath(os.path.join(path_set, basename)).replace("\\", "/")
+                count, name = self.getNameByPath(path)
+                link = Link(name, 1, "PARENT-%d-PROJECT_LOC/%s" % (count, name))
+                links.append(link)
+        
+        return links
+
+

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,5 @@
 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)
@@ -35,7 +34,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 +99,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
 
@@ -183,6 +175,38 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
     def setRteVirtuallyMappedToTaskRef(self, value):
         self.rteVirtuallyMappedToTaskRef = value
         return self   
+    
+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 +220,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 +287,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 +329,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 +551,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"):

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,95 @@
 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/tests/models/test_importer_xdm.py

@@ -0,0 +1,61 @@
+
+from ...models.eb_doc import PreferenceModel
+from ...models.importer_xdm import SystemDescriptionImporter
+
+
+class TestSystemDescriptionImporter:
+
+    def test_get_parsed_input_files(self):
+        document = PreferenceModel.getInstance()
+        importer = document.getSystemDescriptionImporter()
+        importer.addInputFile("${env_var:TRESOS_OUTPUT_DIR}\**\*.arxml")
+        input_files = importer.getParsedInputFiles({"env_var:TRESOS_OUTPUT_DIR": "c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd", "base_path": None})
+
+        assert(len(input_files) == 1)
+        assert(input_files[0] == "c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd\\**\\*.arxml")
+        document = PreferenceModel.getInstance()
+        importer = document.getSystemDescriptionImporter()
+        path_segments = importer.getAllPaths("../../EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd")
+        assert(len(path_segments) == 7)
+        assert(path_segments[0] == "EB")
+        assert(path_segments[1] == "EB/ACG-8_8_8_WIN32X86")
+        assert(path_segments[2] == "EB/ACG-8_8_8_WIN32X86/workspace")
+        assert(path_segments[6] == "EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd")
+
+    def test_get_links(self):
+        document = PreferenceModel.getInstance()
+        importer = document.getSystemDescriptionImporter()
+        file_list = []
+        file_list.append("../../EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/Atomics_Bswmd.arxml")
+        file_list.append("../../EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/BswM.arxml")
+        file_list.append("../../EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/Atomics_Bswmd.arxml")
+
+        links = importer.getLinks(file_list)
+        assert(len(links) == 9)
+        assert(links[0].name == "EB")
+        assert(links[0].type == 2)
+        assert(links[0].locationURI == "virtual:/virtual")
+        
+        assert(links[1].name == "EB/ACG-8_8_8_WIN32X86")
+        assert(links[1].type == 2)
+        assert(links[1].locationURI == "virtual:/virtual")
+        
+        assert(links[2].name == "EB/ACG-8_8_8_WIN32X86/workspace")
+        assert(links[2].type == 2)
+        assert(links[2].locationURI == "virtual:/virtual")
+
+        assert(links[3].name == "EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte")
+        assert(links[3].type == 2)
+        assert(links[3].locationURI == "virtual:/virtual")
+
+        assert(links[6].name == "EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd")
+        assert(links[6].type == 2)
+        assert(links[6].locationURI == "virtual:/virtual")
+
+        assert(links[7].name == "EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/Atomics_Bswmd.arxml")
+        assert(links[7].type == 1)
+        assert(links[7].locationURI == "PARENT-2-PROJECT_LOC/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/Atomics_Bswmd.arxml")
+
+        assert(links[8].name == "EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/BswM.arxml")
+        assert(links[8].type == 1)
+        assert(links[8].locationURI == "PARENT-2-PROJECT_LOC/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/output/generated/swcd/BswM.arxml")

eb_model/writer/__init__.py

@@ -1 +1,2 @@
-from .text_writer import TextPreferenceModelWriter
+from .text_writer import TextPreferenceModelWriter
+from .project_writer import ABProjectWriter

eb_model/writer/project_writer.py

@@ -0,0 +1,71 @@
+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
+
+class EclipseProjectWriter:
+    def __init__(self):
+        self.logger = logging.getLogger()
+
+    def write_element(self, element: ET.Element, key: str, content: str) -> ET.Element:
+        child_element = ET.SubElement(element, key)
+        child_element.text = str(content)
+
+        return child_element
+
+    def write(self, links: List[Link]):
+        pass
+
+class ABProjectWriter(EclipseProjectWriter):
+    def __init__(self):
+        super().__init__()
+
+    def _write_link(self, element: ET.Element, link: Link):
+        child_element = ET.SubElement(element, "link")
+        self.write_element(child_element, "name", link.name)
+        self.write_element(child_element, "type", link.type)
+        self.write_element(child_element, "locationURI", link.locationURI)
+    
+    def _write_links(self, element: ET.Element, links: List[Link]):
+        child_element = ET.SubElement(element, "linkedResources")
+        for link in links:
+            self._write_link(child_element, link)
+
+        self.logger.info("Total <%d> Links are written." % len(links))
+        
+
+    def _write_file_head(self, element: ET.Element, project: str):
+        if project is not None:
+            self.write_element(element, "name", project)
+        else:
+            self.write_element(element, "name", "project")
+
+        self.write_element(element, "comment", "")
+        self.write_element(element, "projects", "")
+        self.write_element(element, "buildSpec", "")
+        child_element = ET.SubElement(element, "natures")
+        self.write_element(child_element, "nature", "org.artop.aal.workspace.autosarnature")
+
+    def write(self, filename: str, project: str, links: List[Link]):
+        root = ET.Element("projectDescription")
+
+        self._write_file_head(root, project)
+        self._write_links(root, links)
+
+        xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
+
+        dom = minidom.parseString(xml.decode())
+        xml = dom.toprettyxml(indent = "  ", encoding = "UTF-8")
+
+        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)
+        file_list =  sorted(importer.getParsedInputFiles(params))
+        links = importer.getLinks(file_list)
+        self.write(filename, params['project'], links)

eb_model/writer/text_writer.py

@@ -16,10 +16,10 @@ class TextPreferenceModelWriter(TextWriter):
     def __init__(self):
         super().__init__()
 
-    def writer_import_files(self, filename: str, importer: SystemDescriptionImporter, param = {'base_path': None}):
+    def writer_import_files(self, filename: str, importer: SystemDescriptionImporter, params = {'base_path': None, 'wildcard': None, "tresos_output_base_dir": None}):
         self.logger.info("Generate import files list <%s>" % filename)
         lines = []
-        for file in sorted(importer.getParsedInputFiles(param['base_path'], param['wildcard'])):
+        for file in sorted(importer.getParsedInputFiles(params)):
             if file in lines:
                 self.logger.warning("file <%s> is duplicated." % file)
             else:

py_eb_model-1.1.1.dist-info/METADATA

@@ -0,0 +1,188 @@
+Metadata-Version: 2.1
+Name: py-eb-model
+Version: 1.1.1
+Summary: The parser for EB XDM file
+Home-page: UNKNOWN
+Author: melodypapa
+Author-email: melodypapa@outlook.com
+License: proprietary
+Keywords: EB Tresos XDM
+Platform: UNKNOWN
+Classifier: Development Status :: 1 - Planning
+Classifier: Environment :: Console
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+Requires-Dist: openpyxl
+Provides-Extra: pytest
+Requires-Dist: pytest-cov ; extra == 'pytest'
+
+# 1. py-eb-model
+
+1. The python parser engine for EB Tresos Xdm file.
+2. To support EB Tresos data model with python.
+
+# 2. How to create the distribution and upload to pypi
+
+1. Run `python setup.py bdist_wheel` to generate distribution
+2. Run `twine check dist/*` to check the validation of distribution
+3. Run `twine upload dist/*` to upload to pypi repository
+4. Check the website https://pypi.org/project/armodel/ to find out it works or not
+
+And more details can be found at https://packaging.python.org/  
+
+# 3. CLI 
+
+## 3.1. os-task-xlsx
+
+Extract the Os Task information from os.xdm and then report all to Excel file.
+
+```bash
+os-xdm-xlsx data/Os.xdm data/Os.xlsx
+```
+
+**Result:**
+
+1. OsIsrs
+
+![](doc/os-xdm-xlsx/os_isr_in_excel.png)
+
+1. OsTasks
+
+![](doc/os-xdm-xlsx/os_task_in_excel.png)
+
+3. OsScheduleTable
+
+![](doc/os-xdm-xlsx/os_schedule_table_in_excel.png)
+
+4. OsCounter
+
+![](doc/os-xdm-xlsx/os_counter_in_excel.png)
+
+## 3.2. rte-task-xls
+
+Extract the Rte Configuration information from rte.xdm and then report all to Excel file.
+
+1. Export the Rte Configuration information to excel file
+
+```bash
+rte-xdm-xlsx data/Rte.xdm data/Rte.xlsx
+```
+
+2. Export the Runnable Entities information to excel file
+
+```bash
+rte-xdm-xlsx -r data/Rte.xdm data/Os.xdm data/Runnable.xlsx
+```
+
+## 3.3. PrefSystemImporter
+
+Read the EB preference XDM and generate the ARXML file list into text file or create the AUTOSAR builder project file.
+
+```bash
+$ pref-system-importer.exe -h
+usage: pref-system-importer [-h] [-v] [--file-list] [--ab-project] [--base-path BASE_PATH] [--TRESOS_OUTPUT_BASE_DIR TRESOS_OUTPUT_BASE_DIR] [--project PROJECT] INPUTS [INPUTS ...] OUTPUT
+
+positional arguments:
+  INPUTS                The path of perf_imp_xxx.xdm.
+  OUTPUT                The path of output file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -v, --verbose         print debug information.
+  --file-list           generate the file list (Default)
+  --ab-project          generate the AUTOSAR builder project
+  --base-path BASE_PATH
+                        base Path for EB tresos
+  --env ENV [ENV ...]   specify the environment variable
+  --project PROJECT     specify the project name
+```
+### 3.3.1. Configuration
+
+**h, help**
+> Show the usage information 
+
+**-v, --verbose**
+> Print the extra debug information during execution.
+
+**--file-list or --ab-project**
+> Generate ARXML file list text file or AUTOSAR builder project.
+
+**--base-path**
+> Base path for the EB tresos project. **For example**: c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte
+>
+> If the base path is specified, all input preference XDM configuration files will be based on this BasePath, which can solve the problem of the input preference configuration file name being too long.
+
+**--project**
+
+> The project name will be generate in the AUTOSAR build project. 
+>
+> It is meaningless if you choose to generate ARXML file list text file.
+
+**--env**
+
+> Replace the variable definition of ${env_var:xxx} which is defined in the EB preference XDM file.
+
+### 3.3.2. Example
+
+**To generate the ARXML file list:**
+
+* Base path: c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte
+* INPUT: 
+  * c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/.prefs/pref_imp_exp_Imp_System.xdm 
+* OUTPUT: output.lst
+
+```bash
+PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte .prefs/pref_imp_exp_Imp_System.xdm output.lst 
+```
+
+**To generate the AUTOSAR builder project:**
+
+All ARXML files in the .project file will use relative path names, so it is recommended to run PrefSystemImporter in the directory where the .project is located.
+
+* Base Path: c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte
+* INPUTs:
+  *  c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/.prefs/pref_imp_exp_Bswm_rte.xdm 
+  *  c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/.prefs/pref_imp_exp_Imp_System.xdm
+* OUTPUT
+  * c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/ab_project/.project
+* Project Name: SimpleDemoRte
+
+```bash
+cd c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte/ab_project
+PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rte --ab-project --project SimpleDemoRte .prefs/pref_imp_exp_Bswm_rte.xdm .prefs/pref_imp_exp_Imp_System.xdm .project 
+```
+
+# 4. Change History
+
+**Version 0.8.0** 
+
+1. Create the basic model for EB xdm. (Issue #1)
+2. Support to extract the Os Tasks/Isrs from EB xdm and store them in the excel files. (Issue #1)
+
+**Version 1.0.1**
+
+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
+
+**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.
+
+**Version 1.1.1**
+
+1. PrefSystemImporter
+  * Add the support to append SystemMod/EcuExtract.arxml into list automatically.
+
+
+
+

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

@@ -1,32 +1,35 @@
 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/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=4jy328yy2sedIHNwfxjzW3CnVsnTCoskatT8JXjv-rE,2402
+eb_model/models/abstract.py,sha256=uavSXSfKeM2JvOLmpBh43WlYLQ5fCk_F99tf9YVHDkU,3833
 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/models/eclipse_project.py,sha256=W6ovTd3SMnlmWm_efVBZqTUGQebF0hJocsTqMlQ7_XQ,169
+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=otYbFuIKsFl0Jlqm18fRqroTi1fUEGw2HPhGZb7sAQ0,21060
 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=UBN-NZKes_3IX1crTLTDAYOa_wbklRfD9rp5-24WVW4,9909
+eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
+eb_model/parser/rte_xdm_parser.py,sha256=plUue0c4ejreE9w71_mT0JNzGSClf30cXhfC2NalrII,5471
 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/writer/__init__.py,sha256=SE-Kj41HUkVPor7jpNTL3JVPe_9ycmKFWjTFo2VTkTo,50
-eb_model/writer/text_writer.py,sha256=ZSQ6xi-ke41rrchK1474cRNdHRoyj_gucp3GnvZ-ERU,971
+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=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
 py_eb_model/cli/os_xdm_2_xls_cli.py,sha256=BzeFhyWHbG57qieDNESaXYggszHSy17uwCeXvEfrbCQ,1629
@@ -42,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.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.1.1.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.1.dist-info/METADATA,sha256=o3TxYweK34vDd6CJN2ynv3xpTD0PsWNGyNKYco5g9iQ,5869
+py_eb_model-1.1.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.1.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
+py_eb_model-1.1.1.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.1.dist-info/RECORD,,

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

@@ -1,5 +1,5 @@
 [console_scripts]
+PrefSystemImporter = eb_model.cli.pref_system_importer_cli:main
 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
 

py_eb_model-1.0.3.dist-info/METADATA

@@ -1,110 +0,0 @@
-Metadata-Version: 2.1
-Name: py-eb-model
-Version: 1.0.3
-Summary: The parser for EB XDM file
-Home-page: UNKNOWN
-Author: melodypapa
-Author-email: melodypapa@outlook.com
-License: proprietary
-Keywords: EB Tresos XDM
-Platform: UNKNOWN
-Classifier: Development Status :: 1 - Planning
-Classifier: Environment :: Console
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
-Requires-Dist: openpyxl
-Provides-Extra: pytest
-Requires-Dist: pytest-cov ; extra == 'pytest'
-
-# 1. py-eb-model
-
-1. The python parser engine for EB Tresos Xdm file.
-2. To support EB Tresos data model with python.
-
-# 2. How to create the distribution and upload to pypi
-
-1. Run `python setup.py bdist_wheel` to generate distribution
-2. Run `twine check dist/*` to check the validation of distribution
-3. Run `twine upload dist/*` to upload to pypi repository
-4. Check the website https://pypi.org/project/armodel/ to find out it works or not
-
-And more details can be found at https://packaging.python.org/  
-
-# 3. CLI 
-
-## 3.1. os-task-xlsx
-
-Extract the Os Task information from os.xdm and then report all to Excel file.
-
-```bash
-os-xdm-xlsx data/Os.xdm data/Os.xlsx
-```
-
-**Result:**
-
-1. OsIsrs
-
-![](doc/os-xdm-xlsx/os_isr_in_excel.png)
-
-1. OsTasks
-
-![](doc/os-xdm-xlsx/os_task_in_excel.png)
-
-3. OsScheduleTable
-
-![](doc/os-xdm-xlsx/os_schedule_table_in_excel.png)
-
-4. OsCounter
-
-![](doc/os-xdm-xlsx/os_counter_in_excel.png)
-
-## 3.2. rte-task-xls
-
-Extract the Rte Configuration information from rte.xdm and then report all to Excel file.
-
-1. Export the Rte Configuration information to excel file
-
-```bash
-rte-xdm-xlsx data/Rte.xdm data/Rte.xlsx
-```
-
-2. Export the Runnable Entities information to excel file
-
-```bash
-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
-
-**Version 0.8.0** 
-
-1. Create the basic model for EB xdm. (Issue #1)
-2. Support to extract the Os Tasks/Isrs from EB xdm and store them in the excel files. (Issue #1)
-
-**Version 1.0.1**
-
-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
-
-**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.
-