armodel 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

armodel/cli/arxml_dump_cli.py

@@ -17,16 +17,16 @@ def show_variable_access(indent:int, variable_access: VariableAccess):
             print("%s: %s" % (" " * indent, autosar_variable_in_impl_datatype.port_prototype.value))
             print("%s: %s" % (" " * indent, autosar_variable_in_impl_datatype.target_data_prototype.value))
 
-def show_port(indent:int, port_portotype: PortPrototype):
-    if (isinstance(port_portotype, RPortPrototype)):
-        print("%s-RPort: %s (%s)" % (" " * indent, port_portotype.short_name, port_portotype.required_interface_tref.value))
-        for client_com_spec in port_portotype.getClientComSpecs():
+def show_port(indent:int, port_prototype: PortPrototype):
+    if (isinstance(port_prototype, RPortPrototype)):
+        print("%s-RPort: %s (%s)" % (" " * indent, port_prototype.short_name, port_prototype.required_interface_tref.value))
+        for client_com_spec in port_prototype.getClientComSpecs():
             print("%s    : %s (ClientComSpec)" % (" " * (indent + 2), client_com_spec.operation_ref.value))
-        for com_spec in port_portotype.getNonqueuedReceiverComSpecs():
+        for com_spec in port_prototype.getNonqueuedReceiverComSpecs():
             print("%s    : %s (NonqueuedReceiverComSpec)" % (" " * (indent + 2), com_spec.data_element_ref.value))
-    elif (isinstance(port_portotype, PPortPrototype)):
-        print("%s-PPort: %s (%s)" % (" " * indent, port_portotype.short_name, port_portotype.provided_interface_tref.value))
-        for com_spec in port_portotype.getNonqueuedSenderComSpecs():
+    elif (isinstance(port_prototype, PPortPrototype)):
+        print("%s-PPort: %s (%s)" % (" " * indent, port_prototype.short_name, port_prototype.provided_interface_tref.value))
+        for com_spec in port_prototype.getNonqueuedSenderComSpecs():
             print("%s    : %s (NonqueuedSenderComSpec)" % (" " * (indent + 2), com_spec.data_element_ref.value))
     else:
         raise ValueError("Unsupported Port prototype")

armodel/cli/swc_list_cli.py

@@ -0,0 +1,81 @@
+import argparse
+import pkg_resources
+import logging
+import sys
+import os.path
+
+from armodel import AUTOSAR, ARPackage
+from armodel.parser import ARXMLParser
+
+from ..lib import InputFileParser, SwComponentAnalyzer
+
+def main():
+    version = pkg_resources.require("armodel")[0].version
+
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("-f", "--format", required= False, help= "Specify the short or long name of Sw-C. [short|long]")
+    ap.add_argument("--filter", required= False, help = "Set the filter condition. [CompositionSwComponent]")
+    ap.add_argument("Input", help = "The path of AUTOSAR XML", nargs='+')
+
+    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(".", 'swc-list.log')
+
+    if os.path.exists(log_file):
+        os.remove(log_file)
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    logger.setLevel(logging.DEBUG)
+    file_handler.setLevel(logging.DEBUG)
+
+    if args.verbose:
+        stdout_handler.setLevel(logging.DEBUG)
+        
+    else:
+        stdout_handler.setLevel(logging.INFO)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(stdout_handler)    
+
+    try:
+        parser = InputFileParser(args.Input)
+        filenames = parser.parse()
+
+        document = AUTOSAR().getInstance()
+        parser = ARXMLParser({'warning': True})
+
+        format = "short"
+        if args.format is not None and args.format.lower() == "long":
+            format = "long"
+
+        for filename in filenames:
+            parser.load(filename, document)
+
+        filter = ""
+        if args.filter is not None and args.filter.lower() == "compositionswcomponent":
+            filter = "CompositionSwComponent"
+
+        analyzer = SwComponentAnalyzer()
+        analyzer.import_data(document)
+        analyzer.print_out({
+            'format': format,
+            'filter': filter,
+        })
+        
+    except Exception as e:
+        #print(e)
+        raise e
+
+if __name__ == "__main__":
+    main()

armodel/lib/__init__.py

@@ -0,0 +1,3 @@
+
+from .cli_args_parser import InputFileParser
+from .data_analyzer import SwComponentAnalyzer

armodel/lib/cli_args_parser.py

@@ -0,0 +1,36 @@
+from typing import List
+
+import logging
+import os, re
+
+class InputFileParser:
+    def __init__(self, args: List[str]) -> None:
+        self._args = args
+        self._filenames = []                # type: List[str]
+        self._logger = logging.getLogger()
+
+    def _parse_file_list(self, file):
+        with open(file) as f_in:
+            for line in f_in:
+                self._filenames.append(line.strip())
+
+    def _parse_dir_files(self, dir_name):
+        for (root, _, files) in os.walk(dir_name, topdown=False):
+            for file in files:
+                m = re.match(r'.*\.arxml$', file, re.I)
+
+                if m:
+                    self._filenames.append(os.path.join(root, file))
+
+    def parse(self) -> List[str]:
+        for input_file in self._args:
+            if os.path.isdir(input_file):
+                self._parse_dir_files(input_file)
+            else:
+                if input_file[0] == "@":
+                    self._logger.debug("Parse ARXML list file %s " % input_file)
+                    self._parse_file_list(input_file[1:])
+                else:
+                    self._filenames.append(input_file)
+
+        return self._filenames

armodel/lib/data_analyzer.py

@@ -0,0 +1,34 @@
+import logging
+
+from typing import List
+from ..models import AUTOSAR, ARPackage, AtomicSwComponentType, CompositionSwComponentType
+
+class SwComponentAnalyzer:
+    def __init__(self) -> None:
+        self.swcs = []      # type: List[AtomicSwComponentType]
+
+    def parse_pkg(self, parent: ARPackage):
+        for pkg in parent.getARPackages():
+            self.parse_pkg(pkg)
+        for swc in parent.getSwComponentTypes():
+            self.swcs.append(swc)
+
+    def import_data(self, document: AUTOSAR):
+        for pkg in document.getARPackages():
+            self.parse_pkg(pkg)
+
+    def print_out(self, option = {}):
+        logger = logging.getLogger()
+
+        logger.info("== SW-C LIST ==")
+
+        if option['filter'] == 'CompositionSwComponent':
+            swc_list = filter(lambda o: isinstance(o, CompositionSwComponentType), self.swcs)
+        else:
+            swc_list = self.swcs
+
+        for swc in sorted(swc_list, key = lambda o: o.short_name):
+            if option['format'] == 'long':
+                logger.info("%s" % swc.full_name)
+            else:
+                logger.info("%s" % swc.short_name)

armodel/models/ar_object.py

@@ -5,6 +5,6 @@ class ARObject(metaclass=ABCMeta):
         if type(self) == ARObject:
             raise NotImplementedError("ARObject is an abstract class.")
         
-        self.parent = None
+        self.parent = None              # type: ARObject
         self.checksum = None            # type: str
         self.timestamp = None           # type: str

armodel/models/ar_package.py

@@ -1,10 +1,10 @@
 from typing import List
 from .general_structure import Identifiable, ARObject, Referrable, CollectableElement, SwcBswMapping
 from .port_interface import SenderReceiverInterface, ClientServerInterface
-from .sw_component import SwComponentType, EcuAbstractionSwComponentType, AtomicSwComponentType, ApplicationSwComponentType, ServiceSwComponentType, CompositionSwComponentType
+from .sw_component import SwComponentType, EcuAbstractionSwComponentType, AtomicSwComponentType, ApplicationSwComponentType, ServiceSwComponentType, CompositionSwComponentType, SensorActuatorSwComponentType
 from .datatype import ImplementationDataType, ApplicationDataType, DataTypeMappingSet, DataTypeMap, SwBaseType, ApplicationPrimitiveDataType, ApplicationRecordDataType
 from .m2_msr import CompuMethod
-from .implementation import BswImplementation
+from .implementation import BswImplementation, SwcImplementation, Implementation
 from .bsw_module_template import BswModuleDescription, BswModuleEntry
 
 class ARPackage(Identifiable, CollectableElement):
@@ -38,6 +38,12 @@ class ARPackage(Identifiable, CollectableElement):
             sw_component = ServiceSwComponentType(self, short_name)
             self.elements[short_name] = sw_component
         return self.elements[short_name]
+    
+    def createSensorActuatorSwComponentType(self, short_name: str) -> SensorActuatorSwComponentType:
+        if (short_name not in self.elements):
+            sw_component = SensorActuatorSwComponentType(self, short_name)
+            self.elements[short_name] = sw_component
+        return self.elements[short_name]
 
     def createCompositionSwComponentType(self, short_name: str) -> CompositionSwComponentType:
         if (short_name not in self.elements):
@@ -110,6 +116,12 @@ class ARPackage(Identifiable, CollectableElement):
             sw_component = BswImplementation(self, short_name)
             self.elements[short_name] = sw_component
         return self.elements[short_name]
+    
+    def createSwcImplementation(self, short_name: str) -> SwcImplementation:
+        if (short_name not in self.elements):
+            sw_component = SwcImplementation(self, short_name)
+            self.elements[short_name] = sw_component
+        return self.elements[short_name]
 
     def createSwcBswMapping(self, short_name: str) -> SwcBswMapping:
         if (short_name not in self.elements):
@@ -128,6 +140,9 @@ class ARPackage(Identifiable, CollectableElement):
 
     def getSwComponentTypes(self) -> List[SwComponentType]:
         return list(filter(lambda a : isinstance(a, SwComponentType), self.elements.values()))
+    
+    def getSensorActuatorSwComponentType(self) -> List[SensorActuatorSwComponentType]:
+        return list(filter(lambda a : isinstance(a, SensorActuatorSwComponentType), self.elements.values()))
 
     def getAtomicSwComponentTypes(self) -> List[AtomicSwComponentType]:
         return list(filter(lambda a : isinstance(a, AtomicSwComponentType), self.elements.values()))
@@ -155,6 +170,12 @@ class ARPackage(Identifiable, CollectableElement):
 
     def getBswImplementations(self) -> List[BswImplementation]:
         return list(filter(lambda a: isinstance(a, BswImplementation), self.elements.values()))
+    
+    def getSwcImplementations(self) -> List[SwcImplementation]:
+        return list(filter(lambda a: isinstance(a, SwcImplementation), self.elements.values()))
+    
+    def getImplementations(self) -> List[Implementation]:
+        return list(filter(lambda a: isinstance(a, Implementation), self.elements.values()))
 
     def getSwcBswMappings(self) -> List[SwcBswMapping]:
         return list(filter(lambda a: isinstance(a, SwcBswMapping), self.elements.values()))
@@ -220,6 +241,8 @@ class AUTOSAR (ARObject, CollectableElement):
             raise ValueError("%s is not ImplementationDataType." % data_type)
             
     def addDataTypeMap(self, data_type_map: DataTypeMap):
+        if (data_type_map.application_data_type_ref is None) or (data_type_map.implementation_data_type_ref is None):
+            return
         self._appl_impl_type_maps[data_type_map.application_data_type_ref.value] = data_type_map.implementation_data_type_ref.value
         self._impl_appl_type_maps[data_type_map.implementation_data_type_ref.value] = data_type_map.application_data_type_ref.value
 

armodel/models/common_structure.py

@@ -1,4 +1,5 @@
-import re
+#from __future__ import annotations
+
 from abc import ABCMeta
 from typing import List
 
@@ -6,6 +7,8 @@ from .general_structure import ARObject, ARElement, Identifiable
 from .data_dictionary import SwDataDefProps
 from .ar_ref import RefType
 
+import re
+
 class ValueSpecification(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == ValueSpecification:
@@ -139,11 +142,17 @@ class MemorySection(Identifiable):
 
     @alignment.setter
     def alignment(self, value:str):
-        if value  in ("UNKNOWN", "UNSPECIFIED", "BOOLEAN", "PTR"):
-            self._alignment = value
-        elif re.match(r'\d+', value):
+        match = False
+        if value in ("UNKNOWN", "UNSPECIFIED", "BOOLEAN", "PTR"):
             self._alignment = value
+            match = True
         else:
+            m = re.match(r'^\d+', value)
+            if m:
+                self._alignment = value
+                match = True
+                
+        if not match:
             raise ValueError("Invalid alignment <%s> of memory section <%s>" % (value, self.short_name))
         
 

armodel/models/implementation.py

@@ -74,14 +74,15 @@ class BswImplementation(Implementation):
         self.ar_release_version = ""
         self.revision_label_string = ""                 # 1
         self.behavior_ref = None                        # type: RefType
-        self.preconfigured_configuration_refs = []      # type: List[RefType]
-        self.recommended_configuration_refs = []        # type: List[RefType]
+        self.preconfigured_configuration_ref = None     # *
+        self.recommended_configuration_ref = None       # *
         self.vendor_api_infix = ""                      # 0..1
-        self.vendor_specific_module_def_refs = []     # List[RefType]
+        self.vendor_specific_module_def_ref = None      # *
 
-    def addVendorSpecificModuleDefRef(self, vendor_specific_module_def_ref: RefType):
-        self.vendor_specific_module_def_refs.append(vendor_specific_module_def_ref)
-
-    def getVendorSpecificModuleDefRefs(self) -> List[RefType]:
-        return self.vendor_specific_module_def_refs
+class SwcImplementation(Implementation):
+    def __init__(self, parent: ARObject, short_name: str) -> None:
+        super().__init__(parent, short_name)
 
+        self.behavior_ref = None                        # type: RefType
+        self.per_instance_memory_size = None
+        self.required_rte_vendor = ""

armodel/models/sw_component.py

@@ -11,6 +11,8 @@ class VariableAccess(Identifiable):
     def __init__(self, parent: ARObject, short_name):
         super().__init__(parent, short_name)
         self.accessed_variable_ref = AutosarVariableRef()
+        self.accessed_variable_ref.parent = self
+        self.parent = parent
         self.local_variable_ref = None  # type: RefType
 
 class ExecutableEntity(Identifiable):

armodel/parser/arxml_parser.py

@@ -15,6 +15,7 @@ from ..models import Implementation, Code, AutosarEngineeringObject, ResourceCon
 from ..models import BswImplementation, BswModuleDescription, BswInternalBehavior, BswCalledEntity, BswModuleEntity, BswScheduleEvent, SwcBswMapping, SwcBswRunnableMapping
 
 from typing import List
+from colorama import Fore
 import xml.etree.ElementTree as ET
 import re
 import logging
@@ -24,6 +25,7 @@ class ARXMLParser:
         self.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
         self.options = {}
         self.options['warning'] = False
+        self.logger = logging.getLogger()
         
         self._processOptions(options=options)
 
@@ -35,7 +37,7 @@ class ARXMLParser:
 
     def _raiseError(self, error_msg):
         if (self.options['warning'] == True):
-            logging.error(error_msg)
+            self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise ValueError(error_msg)
 
@@ -125,24 +127,25 @@ class ARXMLParser:
         return None
 
     def readChildRefElementList(self, element, key) -> List[RefType]:
-        list_element = element.find("./xmlns:%sS" % key, self.nsmap)
+        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
         results = []
-        if list_element != None:
-            child_elements = list_element.findall("./xmlns:%s" % key, self.nsmap)
-            for child_element in child_elements:
-                ref = RefType()
-                ref.dest = child_element.attrib['DEST']
-                ref.value = child_element.text
-                results.append(ref)
-
+        for child_element in child_elements:
+            ref = RefType()
+            ref.dest = child_element.attrib['DEST']
+            ref.value = child_element.text
+            results.append(ref)
         return results
 
-    def readAutosarVariableInImplDatatype(self, element, accessed_variable_ref: AutosarVariableRef):
+    def readAutosarVariableInImplDatatype(self, element: ET.Element, accessed_variable_ref: AutosarVariableRef):
         child_element = element.find("./xmlns:ACCESSED-VARIABLE/xmlns:AUTOSAR-VARIABLE-IREF", self.nsmap)
         if (child_element != None):
             autosar_variable_in_impl_datatype = ArVariableInImplementationDataInstanceRef()
             autosar_variable_in_impl_datatype.port_prototype_ref = self.readChildOptionalRefElement(child_element, "PORT-PROTOTYPE-REF")
-            autosar_variable_in_impl_datatype.target_data_prototype_ref = self.readChildRefElement("", child_element, "TARGET-DATA-PROTOTYPE-REF")
+            if autosar_variable_in_impl_datatype.port_prototype_ref is None:
+                self._raiseError("PORT-PROTOTYPE-REF of <%s> is empty." % accessed_variable_ref.parent.short_name)
+            autosar_variable_in_impl_datatype.target_data_prototype_ref = self.readChildOptionalRefElement(child_element, "TARGET-DATA-PROTOTYPE-REF")
+            if autosar_variable_in_impl_datatype.target_data_prototype_ref is None:
+                self._raiseError("TARGET-DATA-PROTOTYPE-REF of <%s> is empty." % accessed_variable_ref.parent.short_name)
             accessed_variable_ref.autosar_variable_in_impl_datatype = autosar_variable_in_impl_datatype
 
     def readLocalVariableRef(self, element, accessed_variable_ref: AutosarVariableRef):
@@ -153,6 +156,8 @@ class ARXMLParser:
     def _readVariableAccesses(self, element, parent: RunnableEntity, key: str):
         for child_element in element.findall("./xmlns:%s/xmlns:VARIABLE-ACCESS" % key, self.nsmap):
             short_name = self.readShortName(child_element)
+            self.logger.debug("readVariableAccesses %s" % short_name)
+
             if (key == "DATA-RECEIVE-POINT-BY-ARGUMENTS"):
                 variable_access = parent.createDataReceivePointByArgument(short_name)
                 self.readAutosarVariableInImplDatatype(child_element, variable_access.accessed_variable_ref)
@@ -179,12 +184,12 @@ class ARXMLParser:
             ref = self.readChildOptionalRefElement(child_element, "BSW-MODULE-ENTRY-REF") 
             if (ref != None):
                 parent.implemented_entry_refs.append(ref)
-            logging.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.short_name)
+            self.logger.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.short_name)
 
     def readProvidedModeGroup(self, element, parent: BswModuleDescription):
         for child_element in element.findall("./xmlns:PROVIDED-MODE-GROUPS/xmlns:MODE-DECLARATION-GROUP-PROTOTYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readProvidedModeGroup %s" % short_name)
+            self.logger.debug("readProvidedModeGroup %s" % short_name)
 
             mode_group = parent.createProvidedModeGroup(short_name)
             mode_group.type_tref = self.readChildRefElement(parent.short_name, child_element, "TYPE-TREF")
@@ -192,13 +197,15 @@ class ARXMLParser:
     def readRequiredModeGroup(self, element, parent: BswModuleDescription):
         for child_element in element.findall("./xmlns:REQUIRED-MODE-GROUPS/xmlns:MODE-DECLARATION-GROUP-PROTOTYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readRequiredModeGroup %s" % short_name)
+            self.logger.debug("readRequiredModeGroup %s" % short_name)
             mode_group = parent.createProvidedModeGroup(short_name)
             mode_group.type_tref = self.readChildRefElement(parent.short_name, child_element, "TYPE-TREF")
 
     def readCanEnterExclusiveAreaRefs(self, element, entity: ExecutableEntity):
-        for ref in self.readChildRefElementList(element, "CAN-ENTER-EXCLUSIVE-AREA-REF"):
-            entity.addCanEnterExclusiveAreaRef(ref)
+        child_element = element.find("./xmlns:CAN-ENTER-EXCLUSIVE-AREA-REFS", self.nsmap)
+        if child_element != None:
+            for ref in self.readChildRefElementList(child_element, "CAN-ENTER-EXCLUSIVE-AREA-REF"):
+                entity.addCanEnterExclusiveAreaRef(ref)
 
     def readExecutableEntity(self, element, entity: ExecutableEntity):
         self.readCanEnterExclusiveAreaRefs(element, entity)
@@ -211,7 +218,7 @@ class ARXMLParser:
     def readBswCalledEntity(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:ENTITYS/xmlns:BSW-CALLED-ENTITY", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswCalledEntity %s" % short_name)
+            self.logger.debug("readBswCalledEntity %s" % short_name)
             entity = parent.createBswCalledEntity(short_name)
 
             self.readBswModuleEntity(child_element, entity)
@@ -219,7 +226,7 @@ class ARXMLParser:
     def readBswSchedulableEntity(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:ENTITYS/xmlns:BSW-SCHEDULABLE-ENTITY", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswSchedulableEntity %s" % short_name)
+            self.logger.debug("readBswSchedulableEntity %s" % short_name)
             entity = parent.createBswSchedulableEntity(short_name)
 
             self.readBswModuleEntity(child_element, entity)
@@ -233,7 +240,7 @@ class ARXMLParser:
     def readBswModeSwitchEvent(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:EVENTS/xmlns:BSW-MODE-SWITCH-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswModeSwitchEvent %s" % short_name)
+            self.logger.debug("readBswModeSwitchEvent %s" % short_name)
             event = parent.createBswModeSwitchEvent(short_name)
 
             self.readBswScheduleEvent(child_element, event)
@@ -241,7 +248,7 @@ class ARXMLParser:
     def readBswTimingEvent(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:EVENTS/xmlns:BSW-TIMING-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswTimingEvent %s" % short_name)
+            self.logger.debug("readBswTimingEvent %s" % short_name)
             event = parent.createBswTimingEvent(short_name)
             event.period = self.readChildElementFloatValue(short_name, child_element, "PERIOD")
 
@@ -250,7 +257,7 @@ class ARXMLParser:
     def readBswDataReceivedEvent(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:EVENTS/xmlns:BSW-DATA-RECEIVED-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswDataReceivedEvent %s" % short_name)
+            self.logger.debug("readBswDataReceivedEvent %s" % short_name)
             event = parent.createBswDataReceivedEvent(short_name)
             event.data_ref = self.readChildRefElement(parent.short_name, child_element, "DATA-REF")
 
@@ -259,15 +266,17 @@ class ARXMLParser:
     def readBswInternalTriggerOccurredEvent(self, element, parent: BswInternalBehavior):
         for child_element in element.findall("./xmlns:EVENTS/xmlns:BSW-INTERNAL-TRIGGER-OCCURRED-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readBswInternalTriggerOccurredEvent %s" % short_name)
+            self.logger.debug("readBswInternalTriggerOccurredEvent %s" % short_name)
             event = parent.createBswInternalTriggerOccurredEvent(short_name)
             event.event_source_ref = self.readChildRefElement(parent.short_name, child_element, "EVENT-SOURCE-REF")
 
             self.readBswScheduleEvent(child_element, event)
 
     def readDataTypeMappingRefs(self, element, behavior: InternalBehavior):
-        for ref in self.readChildRefElementList(element, "DATA-TYPE-MAPPING-REF"):
-            behavior.addDataTypeMappingRef(ref)
+        child_element = element.find("./xmlns:DATA-TYPE-MAPPING-REFS", self.nsmap)
+        if child_element != None:
+            for ref in self.readChildRefElementList(child_element, "DATA-TYPE-MAPPING-REF"):
+                behavior.addDataTypeMappingRef(ref)
 
     def readInternalBehavior(self, element, behavior: InternalBehavior):
         for child_element in element.findall("./xmlns:EXCLUSIVE-AREAS/xmlns:EXCLUSIVE-AREA", self.nsmap):
@@ -280,17 +289,14 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:INTERNAL-BEHAVIORS/xmlns:SWC-INTERNAL-BEHAVIOR", self.nsmap):
             short_name = self.readShortName(child_element)
             behavior = parent.createSwcInternalBehavior(short_name)
-            logging.debug("readSwInternalBehavior %s" % behavior.full_name)
+            self.logger.debug("readSwInternalBehavior %s" % behavior.full_name)
 
             # read the internal behavior
             self.readInternalBehavior(child_element, behavior)
 
             self.readRunnableEntities(child_element, behavior)
             self.readOperationInvokedEvents(child_element, behavior)
-            self.readInitEvents(child_element, behavior)
             self.readTimingEvents(child_element, behavior)
-            self.readDataReceivedEvent(child_element, behavior)
-            self.readSwcModeSwitchEvent(child_element, behavior)
             self.readInternalTriggerOccurredEvent(child_element, behavior)
             self.readExplicitInterRunnableVariables(child_element, behavior)
 
@@ -298,7 +304,7 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:INTERNAL-BEHAVIORS/xmlns:BSW-INTERNAL-BEHAVIOR", self.nsmap):
             short_name = self.readShortName(child_element)
             behavior = parent.createBswInternalBehavior(short_name)
-            logging.debug("readBswInternalBehavior %s" % behavior.full_name)
+            self.logger.debug("readBswInternalBehavior %s" % behavior.full_name)
 
             # read the internal behavior
             self.readInternalBehavior(child_element, behavior)
@@ -316,7 +322,7 @@ class ARXMLParser:
             bsw_module_description = parent.createBswModuleDescription(short_name)
             bsw_module_description.module_id = self.readChildElementNumberValue(short_name, child_element, "MODULE-ID")
 
-            logging.debug("readBswModuleDescription %s" % bsw_module_description.full_name)
+            self.logger.debug("readBswModuleDescription %s" % bsw_module_description.full_name)
 
             self.readBswModuleDescriptionImplementedEntry(child_element, bsw_module_description)
             self.readProvidedModeGroup(child_element, bsw_module_description)
@@ -334,8 +340,8 @@ class ARXMLParser:
             entry.execution_context = self.readChildOptionalElement(child_element, "EXECUTION-CONTEXT")
             entry.sw_service_impl_policy = self.readChildOptionalElement(child_element, "SW-SERVICE-IMPL-POLICY")
 
-            #logging.debug("readBswModuleEntry \n%s" % entry)
-            logging.debug("readBswModuleEntry %s" % entry.short_name)
+            #self.logger.debug("readBswModuleEntry \n%s" % entry)
+            self.logger.debug("readBswModuleEntry %s" % entry.short_name)
 
     def readArtifactDescriptor(self, element, code_desc: Code):
         for child_element in element.findall("./xmlns:ARTIFACT-DESCRIPTORS/xmlns:AUTOSAR-ENGINEERING-OBJECT", self.nsmap):
@@ -344,12 +350,12 @@ class ARXMLParser:
             artifact_desc.category = self.readChildElement(code_desc.short_name, child_element, "CATEGORY")
             code_desc.addArtifactDescriptor(artifact_desc)
             
-            logging.debug("readArtifactDescriptor %s", artifact_desc.short_label)
+            self.logger.debug("readArtifactDescriptor %s", artifact_desc.short_label)
 
     def readCodeDescriptor(self, element, impl: Implementation):
         for child_element in element.findall("./xmlns:CODE-DESCRIPTORS/xmlns:CODE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readCodeDescriptor %s" % short_name)
+            self.logger.debug("readCodeDescriptor %s" % short_name)
             code_desc = impl.createCodeDescriptor(short_name)
             self.readArtifactDescriptor(child_element, code_desc)
 
@@ -361,7 +367,7 @@ class ARXMLParser:
             if (alignment != None):
                 memory_section.alignment = alignment
             memory_section.sw_addr_method_ref = self.readChildRefElement(consumption.short_name, child_element, "SW-ADDRMETHOD-REF")
-            logging.debug("readMemorySections %s" % memory_section.short_name)
+            self.logger.debug("readMemorySections %s" % memory_section.short_name)
 
     def readResourceConsumption(self, element, impl: Implementation):
         child_element = element.find("./xmlns:RESOURCE-CONSUMPTION", self.nsmap)
@@ -374,28 +380,32 @@ class ARXMLParser:
 
     def readImplementation(self, element, impl: Implementation):
         self.readCodeDescriptor(element, impl)
-        impl.programming_language = self.readChildElement(impl.short_name, element, "PROGRAMMING-LANGUAGE")
+        impl.programming_language = self.readChildOptionalElement(element, "PROGRAMMING-LANGUAGE")
         self.readResourceConsumption(element, impl)
-        impl.sw_version = self.readChildElement(impl.short_name, element, "SW-VERSION")
+        impl.sw_version = self.readChildOptionalElement(element, "SW-VERSION")
         impl.swc_bsw_mapping_ref = self.readChildOptionalRefElement(element, "SWC-BSW-MAPPING-REF")
         impl.vendor_id = self.readChildOptionalElementNumberValue(element, "VENDOR-ID")
-        if (impl.vendor_id == None):
-            self._raiseError("Vendor id of <%s> is required" % impl.short_name)
-
-    def readVendorSpecificModuleDefs(self, element, impl: BswImplementation):
-        for ref in self.readChildRefElementList(element, "VENDOR-SPECIFIC-MODULE-DEF-REF"):
-            impl.addVendorSpecificModuleDefRef(ref)
 
     def readBswImplementation(self, element, parent: ARPackage):
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:BSW-IMPLEMENTATION", self.nsmap):
             short_name = self.readShortName(child_element)
-            impl = parent.createBswImplementation(short_name)
-            logging.debug("readImplementation %s" % impl.short_name)
+            impl = parent.createBswImplementation(short_name)   
+            self.logger.debug("readBswImplementation %s" % impl.short_name)
 
             self.readImplementation(child_element, impl)
+
             impl.ar_release_version = self.readChildElement(parent.short_name, child_element, "AR-RELEASE-VERSION")
             impl.behavior_ref = self.readChildRefElement(parent.short_name, child_element, "BEHAVIOR-REF")
-            self.readVendorSpecificModuleDefs(child_element, impl)
+
+    def readSwcImplementation(self, element, parent: ARPackage):
+        for child_element in element.findall("./xmlns:ELEMENTS/xmlns:SWC-IMPLEMENTATION", self.nsmap):
+            short_name = self.readShortName(child_element)
+            impl = parent.createSwcImplementation(short_name)   
+            self.logger.debug("readSwcImplementation %s" % impl.short_name)
+
+            self.readImplementation(child_element, impl)
+
+            impl.behavior_ref = self.readChildRefElement(parent.short_name, child_element, "BEHAVIOR-REF")
 
     def readDataReceivePointByArguments(self, element, parent: RunnableEntity):
         self._readVariableAccesses(element, parent, "DATA-RECEIVE-POINT-BY-ARGUMENTS")
@@ -463,9 +473,11 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:RUNNABLES/xmlns:RUNNABLE-ENTITY", self.nsmap):
             short_name = self.readShortName(child_element)
             runnable = parent.createRunnableEntity(short_name)
-            runnable.can_be_invoked_concurrently = self.readChildElement(short_name, child_element, "CAN-BE-INVOKED-CONCURRENTLY")
+            runnable.can_be_invoked_concurrently = self.readChildOptionalElement(child_element, "CAN-BE-INVOKED-CONCURRENTLY")
             runnable.symbol = self.readChildElement(short_name, child_element, "SYMBOL")
 
+            self.logger.debug("readRunnableEntities %s" % short_name)
+
             self.readDataReceivePointByArguments(child_element, runnable)
             self.readDataReceivePointByValues(child_element, runnable)
             self.readDataReadAccesses(child_element, runnable)
@@ -477,7 +489,7 @@ class ARXMLParser:
             self.readInternalTriggeringPoint(child_element, runnable)
 
     def readRTEEvent(self, element, event: RTEEvent):
-        event.start_on_event_ref = self.readChildRefElement(event.short_name, element, "START-ON-EVENT-REF")
+        event.start_on_event_ref = self.readChildOptionalRefElement(element, "START-ON-EVENT-REF")
 
     def readOperationIRef(self, element, parent: OperationInvokedEvent):
         child_element = element.find("./xmlns:OPERATION-IREF", self.nsmap)
@@ -504,7 +516,7 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:EVENTS/xmlns:INIT-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
             event = parent.createInitEvent(short_name)
-            logging.debug("readInitEvents %s" % event.short_name)
+
             self.readRTEEvent(child_element, event)
 
     def readTimingEvents(self, element, parent: SwcInternalBehavior):
@@ -523,7 +535,7 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:EVENTS/xmlns:DATA-RECEIVED-EVENT", self.nsmap):
             short_name = self.readShortName(child_element)
             event = parent.createDataReceivedEvent(short_name)
-            logging.debug("DataReceivedEvent %s" % event.short_name)
+
             self.readRTEEvent(child_element, event)
             self.readRVariableInAtomicSwcInstanceRef(child_element, event)
 
@@ -605,8 +617,10 @@ class ARXMLParser:
                 array_sub_element = data_type.getImplementationDataTypeElements()[0]
                 if (array_sub_element.category == ImplementationDataType.CATEGORY_TYPE_REFERENCE):
                     data_type.setArrayElementType(array_sub_element.sw_data_def_props.implementation_data_type_ref.value)
+                elif (array_sub_element.category == ImplementationDataType.CATEGORY_TYPE_VALUE):  # TODO: fix 
+                    continue
                 else:
-                    self._raiseError("The catetory <%s> of array sub-element does not support." % array_sub_element.category)
+                    self._raiseError("The category <%s> of array sub-element <%s> does not support." % (array_sub_element.category, data_type.short_name))
 
     def readSwDataTypes(self, element, parent: ARPackage):
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:SW-BASE-TYPE", self.nsmap):
@@ -620,12 +634,12 @@ class ARXMLParser:
                 com_spec.operation_ref = self.readChildRefElement(parent.short_name, child_element, "OPERATION-REF")
                 parent.addRequiredComSpec(com_spec)
             except ValueError as err:
-                print(parent.short_name + ": " + str(err))
+                self.logger.error(parent.short_name + ": " + str(err))
 
     def readReceiverComSpec(self, element, com_spec: ReceiverComSpec):
         #FIXME: readchildElement
         com_spec.data_element_ref = self.readChildOptionalRefElement(element, "DATA-ELEMENT-REF")
-        com_spec.handle_out_of_range = self.readChildElement("", element, "HANDLE-OUT-OF-RANGE")
+        com_spec.handle_out_of_range = self.readChildOptionalElement(element, "HANDLE-OUT-OF-RANGE")
         com_spec.uses_end_to_end_protection = self.readChildOptionalElementBooleanValue(element, "USES-END-TO-END-PROTECTION")
 
     def readNonqueuedReceiverComSpec(self, element, parent: RPortPrototype):
@@ -640,14 +654,14 @@ class ARXMLParser:
                 com_spec.handle_never_received = self.readChildElementBooleanValue("", child_element, "HANDLE-NEVER-RECEIVED")
                 com_spec.handel_timeout_type = self.readChildElement("", child_element, "HANDLE-TIMEOUT-TYPE")
             except ValueError as err:
-                print(parent.short_name + ": " + str(err))
+                self.logger.error(parent.short_name + ": " + str(err))
 
             parent.addRequiredComSpec(com_spec)
 
     def readRPortPrototype(self, element, parent: AtomicSwComponentType):
         for child_element in element.findall("./xmlns:PORTS/xmlns:R-PORT-PROTOTYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readRPortPrototype %s" % short_name)
+            self.logger.debug("readRPortPrototype %s" % short_name)
 
             prototype = parent.createRPortPrototype(short_name)
             prototype.required_interface_tref = self.readChildOptionalRefElement(child_element, "REQUIRED-INTERFACE-TREF")
@@ -658,7 +672,7 @@ class ARXMLParser:
     def readSenderComSpec(self, element, com_spec: SenderComSpec):
         # FIXME:
         com_spec.data_element_ref = self.readChildOptionalRefElement(element, "DATA-ELEMENT-REF")
-        com_spec.handle_out_of_range = self.readChildElement("", element, "HANDLE-OUT-OF-RANGE")
+        com_spec.handle_out_of_range = self.readChildOptionalElement(element, "HANDLE-OUT-OF-RANGE")
         com_spec.uses_end_to_end_protection = self.readChildOptionalElementBooleanValue(element, "USES-END-TO-END-PROTECTION")
 
     def readNonqueuedSenderComSpec(self, element, parent: PPortPrototype):
@@ -670,7 +684,7 @@ class ARXMLParser:
     def readPPortPrototype(self, element, parent: AtomicSwComponentType):
         for child_element in element.findall("./xmlns:PORTS/xmlns:P-PORT-PROTOTYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readPPortPrototype %s" % short_name)
+            self.logger.debug("readPPortPrototype %s" % short_name)
 
             prototype = parent.createPPortPrototype(short_name)
             prototype.provided_interface_tref = self.readChildOptionalRefElement(child_element, "PROVIDED-INTERFACE-TREF")
@@ -695,7 +709,6 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:APPLICATION-SW-COMPONENT-TYPE", self.nsmap):
             short_name = self.readShortName(child_element)
             sw_component = parent.createApplicationSwComponentType(short_name)
-            logging.debug("Read ApplicationSwComponentTypes <%s>" % sw_component.short_name)
             self.readAtomicSwComponentType(child_element, sw_component)
 
     def readComplexDeviceDriverSwComponentTypes(self, element, parent: ARPackage):
@@ -704,6 +717,12 @@ class ARXMLParser:
             sw_component = parent.createApplicationSwComponentType(short_name)
             self.readAtomicSwComponentType(child_element, sw_component)
 
+    def readSensorActuatorSwComponentType(self, element, parent: ARPackage):
+        for child_element in element.findall("./xmlns:ELEMENTS/xmlns:SENSOR-ACTUATOR-SW-COMPONENT-TYPE", self.nsmap):
+            short_name = self.readShortName(child_element)
+            sw_component = parent.createSensorActuatorSwComponentType(short_name)
+            self.readAtomicSwComponentType(child_element, sw_component)
+
     def readServiceSwComponentTypes(self, element, parent: ARPackage):
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:SERVICE-SW-COMPONENT-TYPE", self.nsmap):
             short_name = self.readShortName(child_element)
@@ -729,7 +748,7 @@ class ARXMLParser:
     def readAssemblySwConnectors(self, element, parent: CompositionSwComponentType):
         for child_element in element.findall("./xmlns:CONNECTORS/xmlns:ASSEMBLY-SW-CONNECTOR", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readAssemblySwConnectors %s" % short_name)
+            self.logger.debug("readAssemblySwConnectors %s" % short_name)
 
             connector = parent.createAssemblySwConnector(short_name)
             self.readAssemblySwConnectorProviderIRef(child_element, connector)
@@ -738,7 +757,7 @@ class ARXMLParser:
     def readSwComponentPrototypes(self, element, parent: CompositionSwComponentType):
         for child_element in element.findall("./xmlns:COMPONENTS/xmlns:SW-COMPONENT-PROTOTYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readSwComponentPrototypes %s" % short_name)
+            self.logger.debug("readSwComponentPrototypes %s" % short_name)
 
             prototype = parent.createSwComponentPrototype(short_name)
             prototype.type_tref = self.readChildOptionalRefElement(child_element, "TYPE-TREF")
@@ -746,7 +765,7 @@ class ARXMLParser:
     def readCompositionSwComponentTypes(self, element, parent: ARPackage):
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:COMPOSITION-SW-COMPONENT-TYPE", self.nsmap):
             short_name = self.readShortName(child_element)
-            logging.debug("readCompositionSwComponentTypes: <%s>" % short_name)
+            self.logger.debug("readCompositionSwComponentTypes: <%s>" % short_name)
 
             sw_component = parent.createCompositionSwComponentType(short_name)
             self.readSwComponentType(child_element, sw_component)
@@ -790,8 +809,10 @@ class ARXMLParser:
             parent.addArgumentDataPrototype(prototype)
 
     def readPossibleErrorRefs(self, element, parent: ClientServerOperation):
-        for ref in self.readChildRefElementList(element, "POSSIBLE-ERROR-REF"):
-            parent.addPossibleErrorRef(ref)
+        child_element = element.find("./xmlns:POSSIBLE-ERROR-REFS", self.nsmap)
+        if child_element != None:
+            for ref in self.readChildRefElementList(child_element, "POSSIBLE-ERROR-REF"):
+                parent.addPossibleErrorRef(ref)
 
     def readOperations(self, element, parent: ClientServerInterface):
         for child_element in element.findall("./xmlns:OPERATIONS/xmlns:CLIENT-SERVER-OPERATION", self.nsmap):
@@ -839,7 +860,7 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:COMPU-METHOD", self.nsmap):
             short_name = self.readShortName(child_element)
             compu_method = parent.createCompuMethod(short_name)
-            compu_method.category = self.readChildElement(short_name, child_element, "CATEGORY")
+            compu_method.category = self.readChildOptionalElement(child_element, "CATEGORY")
             self.readCompuInternalToPhys(child_element, compu_method)
 
     def readSwcBswRunnableMappings(self, element, parent: SwcBswMapping):
@@ -863,7 +884,7 @@ class ARXMLParser:
             short_name = self.readShortName(child_element)
             ar_package = parent.createARPackage(short_name)
 
-            logging.debug("readARPackages %s" % ar_package.full_name)
+            self.logger.debug("readARPackages %s" % ar_package.full_name)
 
             self.readSenderReceiverInterfaces(child_element, ar_package)
             self.readClientServerInterfaces(child_element, ar_package)
@@ -877,20 +898,23 @@ class ARXMLParser:
             self.readEcuAbstractionSwComponents(child_element, ar_package)
             self.readApplicationSwComponentTypes(child_element, ar_package)
             self.readComplexDeviceDriverSwComponentTypes(child_element, ar_package)
+            self.readSensorActuatorSwComponentType(child_element, ar_package)
             self.readServiceSwComponentTypes(child_element, ar_package)
             self.readCompositionSwComponentTypes(child_element, ar_package)
             self.readBswModuleDescription(child_element, ar_package)
             self.readBswModuleEntry(child_element, ar_package)
             self.readSwcBswMappings(child_element, ar_package)
             self.readBswImplementation(child_element, ar_package)
-
+            self.readSwcImplementation(child_element, ar_package)
 
     def load(self, filename, document: AUTOSAR):
+        self.logger.info("Load %s ..." % filename)
+
         tree = ET.parse(filename)
         root = tree.getroot()
         if (self.getPureTagName(root.tag) != "AUTOSAR"):
             self._raiseError("Invalid ARXML file <%s>" % filename)
 
-        print("Load %s ..." % filename)
+        
 
         self.readARPackages(root, document)

{armodel-1.1.0.dist-info → armodel-1.3.0.dist-info}/METADATA

@@ -1,145 +1,185 @@
-Metadata-Version: 2.1
-Name: armodel
-Version: 1.1.0
-Summary: the python arxml parser
-Home-page: http://github.com/melodypapa/py-armodel
-Author: melodypapa
-Author-email: melodypapa@outlook.com
-License: MIT
-Keywords: AUTOSAR ARXML
-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
-Requires-Python: >=3.5
-Description-Content-Type: text/markdown
-Provides-Extra: pytest
-Requires-Dist: pytest-cov ; extra == 'pytest'
-
-# 1. py-armodel
-
-## 1.1. Purpose
-
-To support AUTOSAR model with python 
-
-## 1.2. Reference Documents
-1. AUTOSAR_TPS_XMLSchemaProductionRules.pdf
-2. AUTOSAR_TPS_ARXMLSerializationRules.pdf
-
-|Version|Documentation|Travis CI|Coverage Status|Pypi|
-|--|--|--|--|--|
-|[![GitHub version](https://badge.fury.io/gh/melodypapa%2Fpy-armodel.svg)](https://badge.fury.io/gh/melodypapa%2Fpy-armodel)|[![Documentation Status](https://readthedocs.org/projects/py-armodel/badge/?version=latest)](https://py-armodel.readthedocs.io/en/latest)|[![](https://www.travis-ci.com/melodypapa/py-armodel.svg?branch=main)](https://www.travis-ci.com/melodypapa/py-armodel)|[![Coverage Status](https://coveralls.io/repos/github/melodypapa/py-armodel/badge.svg?branch=main)](https://coveralls.io/github/melodypapa/py-armodel?branch=main)|[![PyPI version](https://badge.fury.io/py/armodel.svg)](https://badge.fury.io/py/armodel)|
-
-## 1.3. 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/  
-
-## 1.4. How to perform Unit test
-
-* Run `pip install pytest pytest-cov` to install pytest.
-* Run `pytest --cov=armodel --cov-report term-missing` to verify all the functionality.
-
-## 1.5. How to create a distribution and wheel
-
-* Run `python setup.py sdist bdist_wheel --universal`
-
-## 1.6. How to create the document
-
-1. Run `pip install sphinx` to install the necessary document
-
-## 1.7. Heritage 
-
-```
-- ARObject
-  - Referrable
-    - MultilanguageReferrable
-      - Identifiable
-        - PackageableElement
-          - ARElement
-            - AtpType
-              - AutosarDataType
-              - PortInterface
-                - DataInterface
-                  - NvDataInterface
-                  - ParameterInterface
-                  - SenderReceiverInterface
-            - BswModuleEntry
-          - Implementation
-            - BswImplementation
-        - AtpFeature
-          - AtpPrototype
-            - AtpPrototype
-              - DataPrototype
-                - AutosarDataPrototype
-                  - VariableDataPrototype
-                - ApplicationCompositeElementDataPrototype
-                  - ApplicationArrayElement
-                  - ApplicationRecordElement
-          - AtpStructureElement
-            - BswModuleDescription
-        - ExecutableEntity
-        - SwcBswMapping
-  - ValueSpecification
-    - ConstantReference
-```
-
-## 1.8. CLI usages
-
-### 1.8.1. arxml-dump
-
-**Dump all the arxml data to screen**
-
-`arxml-dump --arxml arg -h`
-
---arxml arg     The file name of arxml data
-
--h              show the help information
-
-### 1.8.2. Example for arxml-dump
-
-**Dump the arxml data from test1.arxml and test2.arxml**
-
-`arxml-dump --arxml test1.arxml --arxml test2.arxml`
-
-## 1.9. API
-
-### 1.9.1. Constructor
-
-```
-  ARXMLParser(options={"warning": True})
-```
-
-## 1.10. Change notes:
-
-**Version 0.1.1**
-
-Add the ARRAY category support for ImplementationDataType
-
-**Version 0.1.2**
-
-Add the AsynchronousServerCallPoint support for ARXML
-
-**Version 0.1.3**
-
-Fix the attribute intervalType of **Limit** is empty issue.
-
-**Version 1.0.0**
-
-1. Add the logging support
-2. Add the <warning> option to disable exception raised.
-3. Add the BswMD support
-
-**Version 1.1.0**
-
-1. Add the InitEvent support. (Issue #5)
-2. Add the DataReceiveEvent support. (Issue #5)
-3. Add the SwcModeSwitchEvent support. (Issue #5)
-4. Add the number format alignment supporting for MemorySection
-5. Add the more features supporting for BswImplementation
-
+Metadata-Version: 2.1
+Name: armodel
+Version: 1.3.0
+Summary: the python arxml parser
+Home-page: http://github.com/melodypapa/py-armodel
+Author: melodypapa
+Author-email: melodypapa@outlook.com
+License: MIT
+Keywords: AUTOSAR ARXML
+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
+Requires-Python: >=3.5
+Description-Content-Type: text/markdown
+Requires-Dist: colorama
+Provides-Extra: pytest
+Requires-Dist: pytest-cov ; extra == 'pytest'
+
+# 1. py-armodel
+
+## 1.1. Purpose
+
+To support AUTOSAR model with python 
+
+## 1.2. Reference Documents
+1. AUTOSAR_TPS_XMLSchemaProductionRules.pdf
+2. AUTOSAR_TPS_ARXMLSerializationRules.pdf
+
+|Version|Documentation|Travis CI|Coverage Status|Pypi|
+|--|--|--|--|--|
+|[![GitHub version](https://badge.fury.io/gh/melodypapa%2Fpy-armodel.svg)](https://badge.fury.io/gh/melodypapa%2Fpy-armodel)|[![Documentation Status](https://readthedocs.org/projects/py-armodel/badge/?version=latest)](https://py-armodel.readthedocs.io/en/latest)|[![](https://www.travis-ci.com/melodypapa/py-armodel.svg?branch=main)](https://www.travis-ci.com/melodypapa/py-armodel)|[![Coverage Status](https://coveralls.io/repos/github/melodypapa/py-armodel/badge.svg?branch=main)](https://coveralls.io/github/melodypapa/py-armodel?branch=main)|[![PyPI version](https://badge.fury.io/py/armodel.svg)](https://badge.fury.io/py/armodel)|
+
+## 1.3. 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/  
+
+## 1.4. How to perform Unit test
+
+* Run `pip install pytest pytest-cov` to install pytest.
+* Run `pytest --cov=armodel --cov-report term-missing` to verify all the functionality.
+
+## 1.5. How to create a distribution and wheel
+
+* Run `python setup.py sdist bdist_wheel --universal`
+
+## 1.6. How to create the document
+
+1. Run `pip install sphinx` to install the necessary document
+
+## 1.7. Heritage 
+
+```
+- ARObject
+  - Referrable
+    - MultilanguageReferrable
+      - Identifiable
+        - PackageableElement
+          - ARElement
+            - AtpType
+              - AutosarDataType
+              - PortInterface
+                - DataInterface
+                  - NvDataInterface
+                  - ParameterInterface
+                  - SenderReceiverInterface
+            - BswModuleEntry
+          - Implementation
+            - BswImplementation
+        - AtpFeature
+          - AtpPrototype
+            - AtpPrototype
+              - DataPrototype
+                - AutosarDataPrototype
+                  - VariableDataPrototype
+                - ApplicationCompositeElementDataPrototype
+                  - ApplicationArrayElement
+                  - ApplicationRecordElement
+          - AtpStructureElement
+            - BswModuleDescription
+        - ExecutableEntity
+        - SwcBswMapping
+  - ValueSpecification
+    - ConstantReference
+```
+
+## 1.8. CLI usages
+
+### 1.8.1. arxml-dump
+
+**Dump all the arxml data to screen**
+
+
+`arxml-dump --arxml arg -h`
+
+--arxml arg     The file name of arxml data
+-h              show the help information
+
+#### 1.8.1.1. arxml-dump usage
+
+**Dump the arxml data from test1.arxml and test2.arxml**
+
+```
+$arxml-dump --arxml test1.arxml --arxml test2.arxml
+```
+
+### 1.8.2. swc-list
+
+**List all the SwComponentType in the autosar model**
+
+usage: swc-list [-h] [-v] [-f FORMAT] [--filter FILTER] Input [Input ...]
+
+-h, --help          show the help message and exit
+-v, --verbose       Print debug information
+-f FORMAT, --format FORMAT
+                    Specify the short or long name of Sw-C. 
+                      *short* : only print the short name of SWComponentType
+                      *long*  : print the SWComponentType with ARPackage names
+--filter FILTER     Set the filter condition. 
+                      *CompositionSwComponent* : Print the CompositionSwComponent only.
+
+
+#### 1.8.2.1. List all the SW-Components in the specific path
+
+```
+$swc-list <arxml_folder>
+```
+
+#### 1.8.2.2. List all the CompositionSwComponent with the long name
+
+```
+$swc-list --format long --filter CompositionSwComponent <arxml_folder> 
+```
+
+## 1.9. API
+
+### 1.9.1. Constructor
+
+```
+  ARXMLParser(options={"warning": True})
+```
+
+## 1.10. Change notes:
+
+**Version 0.1.1**
+
+Add the ARRAY category support for ImplementationDataType
+
+**Version 0.1.2**
+
+Add the AsynchronousServerCallPoint support for ARXML
+
+**Version 0.1.3**
+
+Fix the attribute intervalType of **Limit** is empty issue.
+
+**Version 1.0.0**
+
+1. Add the logging support
+2. Add the <warning> option to disable exception raised.
+3. Add the BswMD support
+
+**Version 1.1.0**
+
+1. Add the InitEvent support. (Issue #5)
+2. Add the DataReceiveEvent support. (Issue #5)
+3. Add the SwcModeSwitchEvent support. (Issue #5)
+
+**Version 1.2.0**
+
+1. Add the SwcImplementation support (Issue #9)
+2. Add the integer value for memory section alignment (Issue #9)
+3. Remove the required attributes for the Implementation according to the AUTOSAR standard 23R-11. (Issue #9)
+4. Change the START-ON-EVENT-REF to optional according to the AUTOSAR standard 23R-11. (Issue #9)
+5. Change the HANDLE-OUT-OF-RANGE to optional according to the AUTOSAR standard 23R-11. (Issue #9)
+6. Add the SensorActuatorSwComponentType support (Issue #9)
+7. Change the CATEGORY of COMPU-METHOD to optional.
+8. Change the CAN-BE-INVOKED-CONCURRENTLY to optional.
+

armodel-1.3.0.dist-info/RECORD

@@ -0,0 +1,31 @@
+armodel/__init__.py,sha256=K_KHb3O2T21uteIe0wac-tb3kI2xWHTnwV9ShaXesAU,54
+armodel/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+armodel/cli/arxml_dump_cli.py,sha256=SELbIKJMN65Lzfuze-q_XPBme-KTPrpb2yDl3fLctc8,9932
+armodel/cli/swc_list_cli.py,sha256=9dgW-5Gn1TFqbq5wQd_EFpe9IDLJhPBlYcWRi3m5x84,2414
+armodel/lib/__init__.py,sha256=1i7vjCwcVMUrTrN7mRgQsIN6eP-8gsIKSLDh6YXjNe8,94
+armodel/lib/cli_args_parser.py,sha256=WiTC3wy_fZYloA1AjPqCvvOA_26V_y5toun0qfV51cw,1207
+armodel/lib/data_analyzer.py,sha256=y4ViEGPi_xRKD7hw1ptkGl0_UfhnNdgNzf2YjbOhpjM,1159
+armodel/models/__init__.py,sha256=ijDu-Ra2ZjEJNy88Y5ZsPqxAt05_reQsQti-_X4gD3o,402
+armodel/models/ar_object.py,sha256=-XM0LFxXJovY7ANh-enGmAFu8yhkj9YzFFyCY7ffO8U,371
+armodel/models/ar_package.py,sha256=OPoNGaAhTBf30elxc1dvJMyU6CpMUmvs0SUwaYoEtVs,13275
+armodel/models/ar_ref.py,sha256=RZT6URQ91YgmRk1oUTC-0UPnwn61MgEzmII7UKwQXUM,3548
+armodel/models/bsw_module_template.py,sha256=k_CZWtTipKtVFjIx08uRqadSubVtBJ-NhUlocfoA0a0,11778
+armodel/models/common_structure.py,sha256=DSnuhhYdpDW-klOCZNg8zULuhFBdk7k601YQsPg5IT4,6745
+armodel/models/data_dictionary.py,sha256=xSQzXkLQyOJiLIsczlAzGBnrrvHFVv2_-OfVyN6_MSE,867
+armodel/models/data_prototype.py,sha256=pyIahyJh4KaikMfHikHiKzbGai1JnkrzDZpkVLvb6iU,2096
+armodel/models/datatype.py,sha256=BEc8y3mcQZEvwteFUtJyPYBIwnHJcs9fIyxLgnMK5rk,5802
+armodel/models/ecuc_parameter_def_template.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+armodel/models/general_structure.py,sha256=syJTAAo3DIBE6O0nB8Whm4OEnNyN4uVIAJZPA8t3ukY,4480
+armodel/models/implementation.py,sha256=jfatA90Ww51kMqnUsbx6q4JRRRIRFCQXVg88J44RNoA,3850
+armodel/models/m2_msr.py,sha256=Gk-h-4jSnOkWlfJJcI1-1YvSQvBqkUJZxlzikwgAsec,2165
+armodel/models/port_interface.py,sha256=UDCvj78k3sfG4IJX4FWQj6LUV2mWw6Nt0plMnLsQfZk,6026
+armodel/models/port_prototype.py,sha256=Pqp5euv_RDfTlsEqvBkpAreBFMJlovuU49cJsYD4d3Q,7215
+armodel/models/sw_component.py,sha256=ix6LP1-TLN1r7YEl3CrUoo_ZGfvNGj5q8p3XNPUbabU,20583
+armodel/parser/__init__.py,sha256=whzCLvAstuSlm6scgcCId7AUxSX8z8PV8AIKSNWMkGo,37
+armodel/parser/arxml_parser.py,sha256=LPSj4BxO9fV9pIXVhzMjJmOIC4YUSbDi3H6I11McXOM,56759
+armodel-1.3.0.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
+armodel-1.3.0.dist-info/METADATA,sha256=eael0JbJhlKXRebYA2EHb83ccoqjtCd-Z6zVzx51SJk,5932
+armodel-1.3.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+armodel-1.3.0.dist-info/entry_points.txt,sha256=U-GD6do9I0ZRKENiIdmJMbsLHbtBX2Q7CWIldbNFrc0,109
+armodel-1.3.0.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
+armodel-1.3.0.dist-info/RECORD,,

{armodel-1.1.0.dist-info → armodel-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{armodel-1.1.0.dist-info → armodel-1.3.0.dist-info}/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 arxml-dump = armodel.cli.arxml_dump_cli:cli_main
+swc-list = armodel.cli.swc_list_cli:main
 

armodel-1.1.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-armodel/__init__.py,sha256=K_KHb3O2T21uteIe0wac-tb3kI2xWHTnwV9ShaXesAU,54
-armodel/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/cli/arxml_dump_cli.py,sha256=VBOTkrpj59kt2hM62iNVcDYGch_A2WL5_vFpbmC9ucI,9932
-armodel/models/__init__.py,sha256=ijDu-Ra2ZjEJNy88Y5ZsPqxAt05_reQsQti-_X4gD3o,402
-armodel/models/ar_object.py,sha256=gbo71ZPQ61-OhiPpHFbKtE2JA-8vOzXrd9T_0hh4GfA,341
-armodel/models/ar_package.py,sha256=Z_tcjcJ6lAqp4yDjFkaYFZAuVbXSxoe1cPNBPN4zt4o,11921
-armodel/models/ar_ref.py,sha256=RZT6URQ91YgmRk1oUTC-0UPnwn61MgEzmII7UKwQXUM,3548
-armodel/models/bsw_module_template.py,sha256=k_CZWtTipKtVFjIx08uRqadSubVtBJ-NhUlocfoA0a0,11778
-armodel/models/common_structure.py,sha256=GJFTTwvAZgt9aLY63A3Vynp-tZt65-8Oy4k5YBMYfB8,6559
-armodel/models/data_dictionary.py,sha256=xSQzXkLQyOJiLIsczlAzGBnrrvHFVv2_-OfVyN6_MSE,867
-armodel/models/data_prototype.py,sha256=pyIahyJh4KaikMfHikHiKzbGai1JnkrzDZpkVLvb6iU,2096
-armodel/models/datatype.py,sha256=BEc8y3mcQZEvwteFUtJyPYBIwnHJcs9fIyxLgnMK5rk,5802
-armodel/models/ecuc_parameter_def_template.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/general_structure.py,sha256=syJTAAo3DIBE6O0nB8Whm4OEnNyN4uVIAJZPA8t3ukY,4480
-armodel/models/implementation.py,sha256=iGm5aS1L2sA9eP0jeDFkkIURvr6zzHOCaTtL59G48Yg,3875
-armodel/models/m2_msr.py,sha256=Gk-h-4jSnOkWlfJJcI1-1YvSQvBqkUJZxlzikwgAsec,2165
-armodel/models/port_interface.py,sha256=UDCvj78k3sfG4IJX4FWQj6LUV2mWw6Nt0plMnLsQfZk,6026
-armodel/models/port_prototype.py,sha256=Pqp5euv_RDfTlsEqvBkpAreBFMJlovuU49cJsYD4d3Q,7215
-armodel/models/sw_component.py,sha256=LUmof9nZnN7krpIScS72R6YqTzzpkIFkIvHJoklYXgw,20503
-armodel/parser/__init__.py,sha256=whzCLvAstuSlm6scgcCId7AUxSX8z8PV8AIKSNWMkGo,37
-armodel/parser/arxml_parser.py,sha256=qjzZ9eeG6dGo5yt4Si007PVmaRlI6D8ulZthH5JjUFk,55261
-armodel-1.1.0.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.1.0.dist-info/METADATA,sha256=zTaCxzE_4Cb1THE3btuz04QuzRNaJw6bjVMcAUhDqlU,4359
-armodel-1.1.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-armodel-1.1.0.dist-info/entry_points.txt,sha256=ofkww3HejFuRvGlQSANqFbTEcf0LUXX2FmXZovba9m0,68
-armodel-1.1.0.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.1.0.dist-info/RECORD,,