armodel 1.2.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/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)
 
@@ -134,12 +136,16 @@ class ARXMLParser:
             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):
@@ -150,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)
@@ -176,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")
@@ -189,7 +197,7 @@ 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")
 
@@ -210,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)
@@ -218,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)
@@ -232,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)
@@ -240,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")
 
@@ -249,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")
 
@@ -258,7 +266,7 @@ 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")
 
@@ -281,7 +289,7 @@ 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("readBswInternalBehavior %s" % behavior.full_name)
+            self.logger.debug("readSwInternalBehavior %s" % behavior.full_name)
 
             # read the internal behavior
             self.readInternalBehavior(child_element, behavior)
@@ -296,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)
@@ -314,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)
@@ -332,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):
@@ -342,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)
 
@@ -359,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)
@@ -382,7 +390,7 @@ class ARXMLParser:
         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("readBswImplementation %s" % impl.short_name)
+            self.logger.debug("readBswImplementation %s" % impl.short_name)
 
             self.readImplementation(child_element, impl)
 
@@ -393,7 +401,7 @@ class ARXMLParser:
         for child_element in element.findall("./xmlns:ELEMENTS/xmlns:SWC-IMPLEMENTATION", self.nsmap):
             short_name = self.readShortName(child_element)
             impl = parent.createSwcImplementation(short_name)   
-            logging.debug("readSwcImplementation %s" % impl.short_name)
+            self.logger.debug("readSwcImplementation %s" % impl.short_name)
 
             self.readImplementation(child_element, impl)
 
@@ -468,6 +476,8 @@ class ARXMLParser:
             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)
@@ -624,7 +634,7 @@ 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
@@ -644,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")
@@ -674,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")
@@ -738,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)
@@ -747,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")
@@ -755,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)
@@ -874,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)
@@ -898,11 +908,13 @@ class ARXMLParser:
             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.2.0.dist-info → armodel-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.2.0
+Version: 1.3.0
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -15,6 +15,7 @@ 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'
 
@@ -95,17 +96,47 @@ And more details can be found at https://packaging.python.org/
 
 **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
+#### 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`
+```
+$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
 

{armodel-1.2.0.dist-info → armodel-1.3.0.dist-info}/RECORD

@@ -1,8 +1,12 @@
 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/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=gbo71ZPQ61-OhiPpHFbKtE2JA-8vOzXrd9T_0hh4GfA,341
+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
@@ -16,12 +20,12 @@ armodel/models/implementation.py,sha256=jfatA90Ww51kMqnUsbx6q4JRRRIRFCQXVg88J44R
 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/models/sw_component.py,sha256=ix6LP1-TLN1r7YEl3CrUoo_ZGfvNGj5q8p3XNPUbabU,20583
 armodel/parser/__init__.py,sha256=whzCLvAstuSlm6scgcCId7AUxSX8z8PV8AIKSNWMkGo,37
-armodel/parser/arxml_parser.py,sha256=NgIbfrXL2EoT5po1kvaxdpxnYOJCXk0TBlmgae-OfdQ,55951
-armodel-1.2.0.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.2.0.dist-info/METADATA,sha256=MVqrzP9E8YfO9sA92XWqRNhwt-7CFPDyeg6-lX9ywUg,4998
-armodel-1.2.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.2.0.dist-info/entry_points.txt,sha256=ofkww3HejFuRvGlQSANqFbTEcf0LUXX2FmXZovba9m0,68
-armodel-1.2.0.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.2.0.dist-info/RECORD,,
+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.2.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