py-eb-model 1.0.2__py3-none-any.whl → 1.1.0__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,92 @@
+import argparse
+import pkg_resources
+import logging
+import sys
+import os.path
+import re
+
+from ..writer import TextPreferenceModelWriter, ABProjectWriter
+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("--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.")
+
+    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)
+
+    if args.verbose:
+        file_handler = logging.FileHandler(log_file)
+        file_handler.setFormatter(formatter)
+        file_handler.setLevel(logging.DEBUG)
+
+    logger.setLevel(logging.DEBUG)
+
+    if args.verbose:
+        stdout_handler.setLevel(logging.DEBUG)
+    else:
+        stdout_handler.setLevel(logging.INFO)
+    
+    if args.verbose:
+        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)
+
+        params = {}
+        params['base_path'] = args.base_path
+        params['wildcard'] = True
+        params['project'] = args.project
+
+        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(), params)
+        elif format == "ab_project":
+            writer = ABProjectWriter()
+            writer.writer_import_files(args.OUTPUT, doc.getSystemDescriptionImporter(), params)
+        
+    except Exception as e:
+        logger.error(e)
+        raise e

eb_model/models/__init__.py

@@ -2,3 +2,4 @@ from .abstract import *
 from .os_xdm import *
 from .rte_xdm import *
 from .eb_doc import *
+from .importer_xdm import *

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:

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/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

@@ -0,0 +1,114 @@
+from typing import Dict, List
+
+from ..models.eclipse_project import Link
+from ..models.abstract import EcucObject
+import glob
+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: str):
+        self.inputFiles.append(value)
+        return self
+    
+    def parseWildcard(self, filename: str) -> List[str]:
+        file_list = []
+        for file in glob.iglob(filename, recursive=True):
+            file_list.append(file)
+        return file_list
+    
+    def getParsedInputFiles(self, params = {}) -> List[str]:
+        file_list = []
+        for input_file in self.inputFiles:
+            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:
+                        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(params['base_path'], input_file)))
+                else:
+                    file_list.append(os.path.realpath(os.path.join(params['base_path'], input_file)))
+            else:
+                file_list.append(input_file)
+        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

@@ -565,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:
@@ -602,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      # type: EcucRefType
         self.osTaskAccessingApplication = None
         self.osTaskEventRef = None                      # type: EcucRefType
         self.osTaskResourceRefs = []                    # type: List[EcucRefType]
+        self.osTaskAutostart = None                     # type: OsTaskAutostart
 
     def getOsTaskActivation(self):
         return self.osTaskActivation
@@ -635,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
@@ -675,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):

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:

eb_model/parser/__init__.py

@@ -1,2 +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,6 +1,6 @@
 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
+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
 
@@ -21,17 +21,28 @@ class OsXdmParser(AbstractEbModelParser):
         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"):
             os_task = OsTask(os, ctr_tag.attrib["name"])
             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)
 

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/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/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

@@ -0,0 +1,2 @@
+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
+
+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

@@ -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, 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(params)):
+            if file in lines:
+                self.logger.warning("file <%s> is duplicated." % file)
+            else:
+                lines.append(file)
+
+        self.write(filename, lines)

py_eb_model-1.1.0.dist-info/METADATA

@@ -0,0 +1,184 @@
+Metadata-Version: 2.1
+Name: py-eb-model
+Version: 1.1.0
+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.0**
+
+
+

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

@@ -1,16 +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=M46tHz97GTTud0dCtOhFVZ04B3yzThBmix7OSg00K_c,3315
 eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
-eb_model/models/__init__.py,sha256=TH1OtmIdLdd_sLh9o4rczuRDL68OXxdKjDVuxj4Lfsw,95
-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=Wk_B3yBvXwZpxwKyTKJBIBhr4ovpiglGCq2XEmYX6gs,31678
-eb_model/models/rte_xdm.py,sha256=3fygp2zmvVL9enWqvrERAp5sexNowbsscCKZbIdZiKU,19372
-eb_model/parser/__init__.py,sha256=aQxwzw9OSziRSoZERED_vDxUUGU5GG0yhwMn14ugACw,82
-eb_model/parser/eb_parser.py,sha256=H5NTDdM0DaGiHsZ6VjaA1pKla5mDePmTDp1jjbeFAbE,7057
+eb_model/models/__init__.py,sha256=7_WxCwRdVavLbPzepHWNar3O-rOxhLwmVYWd2pqm2kI,124
+eb_model/models/abstract.py,sha256=9Bvz75pwvSv1Txt68t-01zErY78aWrlis390Mzmfvvw,2394
+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/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=5qF8LouRHjA95YjpXtJwa7s2Vm1eIwvp49FMwc4oacs,9032
+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
@@ -20,8 +24,12 @@ 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/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/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
@@ -37,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.2.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.0.2.dist-info/METADATA,sha256=Fzh5KTLcGdBnJALQrNXQKEiw0Qv-iTlCLcw0Zz6u7NM,2460
-py_eb_model-1.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.0.2.dist-info/entry_points.txt,sha256=vC-sGaF_j37QgkuYsJooGZBN1jnHYWQC4jehliu37fY,119
-py_eb_model-1.0.2.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.0.2.dist-info/RECORD,,
+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.0.2.dist-info → py_eb_model-1.1.0.dist-info}/entry_points.txt

@@ -1,4 +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
 rte-xdm-xlsx = eb_model.cli.rte_xdm_2_xls_cli:main
 

py_eb_model-1.0.2.dist-info/METADATA

@@ -1,97 +0,0 @@
-Metadata-Version: 2.1
-Name: py-eb-model
-Version: 1.0.2
-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
-```
-
-
-# 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
-