armodel 1.5.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

armodel/parser/file_parser.py

@@ -0,0 +1,43 @@
+import logging
+import os
+import re
+from typing import List
+
+
+class FileListParser:
+    '''
+        FileListParser supports to collect the arxml files from the following rules
+         
+    '''
+    def __init__(self) -> None:
+        self.file_list = []
+        self.logger = logging.getLogger()
+
+    def get_file_list(self) -> List[str]:
+        return self.file_list
+    
+    def parse_text_file(self, file):
+        try:
+            with open(file) as f_in:
+                for line in f_in:
+                    self.file_list.append(line.strip())
+        except:
+            self.logger.error("No such file or directory: %s" % os.path.realpath(file))
+
+    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.file_list.append(os.path.join(root, file))
+
+    def parse(self, args: List[str]):
+        for input_file in args:
+            if os.path.isdir(input_file):
+                self.parse_dir_files(input_file)
+            else:
+                if input_file[0] == "@":
+                    logging.debug("Parse ARXML list file %s " % input_file)
+                    self.parse_text_file(input_file[1:])
+                else:
+                    self.file_list.append(input_file)

armodel/tests/test_armodel/models/test_ar_package.py

@@ -1,12 +1,15 @@
 """ Test AR Package """
 import pytest
 
+from ....models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataType
+from ....models.m2.autosar_templates.sw_component_template.components import SwComponentType
 from ....models.ar_package import AUTOSAR
-from ....models.datatype import ApplicationPrimitiveDataType, ApplicationRecordDataType, DataTypeMappingSet, ImplementationDataType, SwBaseType
+from ....models.datatype import ApplicationPrimitiveDataType, ApplicationRecordDataType, DataTypeMappingSet, SwBaseType
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
 from ....models.m2_msr import CompuMethod
-from ....models.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
-from ....models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, ServiceSwComponentType, SwComponentType
+from ....models.m2.autosar_templates.sw_component_template.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
+from ....models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, EcuAbstractionSwComponentType, ServiceSwComponentType
+from ....models.m2.autosar_templates.sw_component_template.composition import CompositionSwComponentType
 
 class TestAUTOSAR:
 

armodel/tests/test_armodel/models/test_ar_ref.py

@@ -2,8 +2,10 @@
 
 import pytest
 
-from ....models.ar_ref import ArVariableInImplementationDataInstanceRef, AutosarVariableRef, PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
-from ....models.ar_ref import OperationInAtomicSwcInstanceRef, POperationInAtomicSwcInstanceRef, ROperationInAtomicSwcInstanceRef, RefType, TRefType, AtpInstanceRef
+from ....models.m2.autosar_templates.generic_structure.abstract_structure import AtpInstanceRef
+from ....models.m2.autosar_templates.sw_component_template.composition.instance_refs import OperationInAtomicSwcInstanceRef, POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
+from ....models.m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import ArVariableInImplementationDataInstanceRef, AutosarVariableRef
+from ....models.ar_ref import RefType, TRefType
 from ....models.general_structure import ARObject
 
 
@@ -21,9 +23,9 @@ class TestARRef:
     def test_AutosarVariableRef(self):
         ref_type = AutosarVariableRef()
         assert(ref_type != None)
-        assert(ref_type.autosar_variable_iref == None)
-        assert(ref_type.autosar_variable_in_impl_datatype == None)
-        assert(ref_type.local_variable_ref == None)
+        assert(ref_type.autosarVariableIRef == None)
+        assert(ref_type.autosarVariableInImplDatatype == None)
+        assert(ref_type.localVariableRef == None)
 
     def test_AtpInstanceRef(self):
         with pytest.raises(NotImplementedError) as err:
@@ -33,24 +35,24 @@ class TestARRef:
     def test_ProvidedPortPrototypeInstanceRef(self):
         ref_type = PPortInCompositionInstanceRef()
         assert(ref_type != None)
-        assert(ref_type.context_component_ref == None)
-        assert(ref_type.target_p_port_ref == None)
+        assert(ref_type.getContextComponentRef() == None)
+        assert(ref_type.getTargetPPortRef() == None)
 
     def test_RequiredPortPrototypeInstanceRef(self):
         ref_type = RPortInCompositionInstanceRef()
         assert(ref_type != None)
-        assert(ref_type.context_component_ref == None)
-        assert(ref_type.target_r_port_ref == None)
+        assert(ref_type.getContextComponentRef() == None)
+        assert(ref_type.getTargetRPortRef() == None)
 
     def test_ArVariableInImplementationDataInstanceRef(self):
         ref_type = ArVariableInImplementationDataInstanceRef()
         assert(ref_type != None)
-        assert(ref_type.port_prototype_ref == None)
-        assert(ref_type.target_data_prototype_ref == None)
+        assert(ref_type.getPortPrototypeRef() == None)
+        assert(ref_type.getTargetDataPrototypeRef() == None)
 
     def test_OperationInAtomicSwcInstanceRef(self):
         with pytest.raises(NotImplementedError) as err:
-            ref_type = OperationInAtomicSwcInstanceRef()
+            _ = OperationInAtomicSwcInstanceRef()
         assert(str(err.value) == "OperationInAtomicSwcInstanceRef is an abstract class.")
 
     def test_POperationInAtomicSwcInstanceRef(self):
@@ -60,8 +62,8 @@ class TestARRef:
         assert(isinstance(ref_type, OperationInAtomicSwcInstanceRef))
         assert(isinstance(ref_type, POperationInAtomicSwcInstanceRef))
         assert(ref_type != None)
-        assert(ref_type.context_p_port_ref == None)
-        assert(ref_type.target_provided_operation_ref == None)
+        assert(ref_type.getContextPPortRef() == None)
+        assert(ref_type.getTargetProvidedOperationRef() == None)
 
     def test_ROperationInAtomicSwcInstanceRef(self):
         ref_type = ROperationInAtomicSwcInstanceRef()
@@ -70,5 +72,5 @@ class TestARRef:
         assert(isinstance(ref_type, OperationInAtomicSwcInstanceRef))
         assert(isinstance(ref_type, ROperationInAtomicSwcInstanceRef))
         assert(ref_type != None)
-        assert(ref_type.context_r_port_ref == None)
-        assert(ref_type.target_required_operation_ref == None)
+        assert(ref_type.getContextRPortRef() == None)
+        assert(ref_type.getTargetRequiredOperationRef() == None)

armodel/tests/test_armodel/models/test_bsw_module_template.py

@@ -15,12 +15,12 @@ class TestBswModuleDescription:
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         bsw_module_description = BswModuleDescription(ar_root, "bsw_module")
-        with pytest.raises(ValueError) as err:
-            bsw_module_description.category = "invalid"
-        assert(str(err.value) == "Invalid category <invalid> of BswModuleDescription <bsw_module>")
+        #with pytest.raises(ValueError) as err:
+        #    bsw_module_description.category = "invalid"
+        #assert(str(err.value) == "Invalid category <invalid> of BswModuleDescription <bsw_module>")
 
-        bsw_module_description.category = "BSW_MODULE"
-        assert(bsw_module_description.category == "BSW_MODULE")
+        bsw_module_description.setCategory("BSW_MODULE")
+        assert(bsw_module_description.getCategory() == "BSW_MODULE")
 
 class Test_M2_AUTOSARTemplates_BswModuleTemplate_BswInterfaces:
     def test_BswModuleEntry(self):

armodel/tests/test_armodel/models/test_common_structure.py

@@ -1,8 +1,9 @@
 import pytest
 
+from ....models.m2.autosar_templates.common_structure.implementation_data_types import AbstractImplementationDataTypeElement, ImplementationDataTypeElement
 from .... import AUTOSAR
-from ....models.common_structure import AbstractImplementationDataTypeElement, ConstantReference, ImplementationDataTypeElement, ValueSpecification, ConstantSpecification, ExecutableEntity
-from ....models.datatype import AbstractImplementationDataType
+from ....models.m2.autosar_templates.common_structure import ConstantReference, ConstantSpecification, ValueSpecification
+from ....models.common_structure import ExecutableEntity
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable
 from ....models.general_structure import MultilanguageReferrable, PackageableElement, Referrable
 
@@ -30,7 +31,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Constants:
     def test_ConstantReference(self):
         ref = ConstantReference()
 
-        assert(ref.constant_ref == None)
+        assert(ref.getConstantRef() == None)
 
         assert(isinstance(ref, ARObject))
         assert(isinstance(ref, ValueSpecification))
@@ -50,9 +51,9 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         ar_root = document.createARPackage("AUTOSAR")
         data_type = ImplementationDataTypeElement(ar_root, "implementation_data_type")
 
-        assert(data_type.short_name == "implementation_data_type")
-        assert(data_type.arraySize == None)
-        assert(data_type.isOptional == None)
+        assert(data_type.getShortName() == "implementation_data_type")
+        assert(data_type.getArraySize() == None)
+        assert(data_type.getIsOptional() == None)
 
         assert(isinstance(data_type, ARObject))
         assert(isinstance(data_type, AbstractImplementationDataTypeElement))
@@ -65,7 +66,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         assert(isinstance(data_type, ImplementationDataTypeElement))
 
         sub_type = data_type.createImplementationDataTypeElement("sub_type")
-        assert(sub_type.short_name == "sub_type")
+        assert(sub_type.getShortName() == "sub_type")
         assert(isinstance(sub_type, ImplementationDataTypeElement))
 
         assert(len(data_type.getImplementationDataTypeElements()) == 1)

armodel/tests/test_armodel/models/test_data_dictionary.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.data_dictionary import SwDataDefProps, SwPointerTargetProps
+from ....models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps, SwPointerTargetProps
 from ....models.general_structure import ARObject
 
 class Test_M2_MSR_DataDictionary_DataDefProperties:
@@ -16,7 +16,7 @@ class Test_M2_MSR_DataDictionary_DataDefProperties:
         assert(props.implementationDataTypeRef == None)
         assert(props.swImplPolicy == None)
         assert(props.swCalibrationAccess == None)
-        assert(props.sw_pointer_target_props == None)
+        assert(props.swPointerTargetProps == None)
 
     def test_SwPointerTargetProps(self):
         props = SwPointerTargetProps()
@@ -24,6 +24,6 @@ class Test_M2_MSR_DataDictionary_DataDefProperties:
         assert(isinstance(props, ARObject))
         assert(isinstance(props, SwPointerTargetProps))
 
-        assert(props.function_pointer_signature == None)
-        assert(props.sw_data_def_props == None)
-        assert(props.target_category == None)
+        assert(props.getFunctionPointerSignatureRef() == None)
+        assert(props.getSwDataDefProps() == None)
+        assert(props.getTargetCategory() == None)

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -2,7 +2,7 @@ import pytest
 
 from .... import AUTOSAR
 from ....models.ar_ref import RefType
-from ....models.data_prototype import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
 from ....models.general_structure import ARObject, AtpFeature, Identifiable, MultilanguageReferrable, Referrable
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
@@ -44,7 +44,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
 
         assert(prototype._parent == ar_root)
         assert(prototype.short_name == "prototype")
-        assert(prototype.type_tref is None)
+        assert(prototype.typeTRef is None)
 
     def test_ApplicationCompositeElementDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:

armodel/tests/test_armodel/models/test_datatype.py

@@ -1,13 +1,13 @@
 import pytest
 
-from .... import AUTOSAR
-from ....models import datatype
-from ....models.common_structure import ImplementationDataTypeElement
-from ....models.data_prototype import ApplicationRecordElement
-from ....models.datatype import AbstractImplementationDataType, ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AtpType, AutosarDataType, BaseType, DataTypeMap, DataTypeMappingSet, ImplementationDataType, ImplementationProps, SymbolProps
+from ....models.m2.autosar_templates.common_structure.implementation_data_types import AbstractImplementationDataType, ImplementationDataType, ImplementationDataTypeElement
+from ....models.m2.autosar_templates.sw_component_template.components import SymbolProps
+from ....models.m2.autosar_templates.common_structure.implementation import ImplementationProps
+from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationRecordElement
+from ....models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AtpType, AutosarDataType, BaseType, DataTypeMap, DataTypeMappingSet
 from ....models.datatype import BaseTypeDirectDefinition, SwBaseType
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
-
+from .... import AUTOSAR
 class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
     def test_ImplementationProps(self):
         with pytest.raises(NotImplementedError) as err:
@@ -28,7 +28,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
 
         assert(prototype._parent == ar_root)
         assert(prototype.short_name == "SymbolProps")
-        assert(prototype.symbol == "")
+        assert(prototype.symbol == None)
 
 class Test_M2_MSR_AsamHdo_BaseTypes:
     def test_BaseType(self):
@@ -99,7 +99,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
 
         assert(data_type._parent == ar_root)
         assert(data_type.short_name == "ApplicationPrimitiveDataType")
-        assert(data_type.sw_data_def_props == None)
+        assert(data_type.swDataDefProps == None)
 
     def test_ApplicationCompositeDataType(self):
         with pytest.raises(NotImplementedError) as err:
@@ -227,7 +227,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         assert(data_type._parent == ar_root)
         assert(data_type.short_name == "ImplementationDataType")
         assert(data_type.sub_elements == [])
-        assert(data_type.symbol_props == None)
+        assert(data_type.symbolProps == None)
         assert(data_type._type_emitter == None)
 
         element = data_type.createImplementationDataTypeElement("ImplementationDataTypeElement")

armodel/tests/test_armodel/models/test_port_interface.py

@@ -2,10 +2,10 @@ import pytest
 
 from ....models.ar_package import AUTOSAR
 from ....models.ar_ref import RefType
-from ....models.data_prototype import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
 from ....models.datatype import AtpType
 from ....models.general_structure import ARElement, ARObject, AtpFeature, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
-from ....models.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:

armodel/tests/test_armodel/parser/test_parse_bswmd.py

@@ -72,13 +72,13 @@ class TestBswMD:
         assert(len(behavior.getBswSchedulableEntities()) == 1)
         entity = behavior.getBswSchedulableEntities()[0]
         assert(entity.short_name == "BswM_MainFunction")
-        assert(entity.minimum_start_interval is not None)
+        assert(entity.minimumStartInterval is not None)
         assert(entity.minimumStartIntervalMs is not None)
         assert(len(entity.getCanEnterExclusiveAreaRefs()) == 1) 
         assert(entity.getCanEnterExclusiveAreaRefs()[0].dest == "EXCLUSIVE-AREA")
         assert(entity.getCanEnterExclusiveAreaRefs()[0].value == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0/SCHM_BSWM_EXCLUSIVE_AREA")
-        assert(entity.implemented_entry_ref.dest == "BSW-MODULE-ENTRY")
-        assert(entity.implemented_entry_ref.value == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
+        assert(entity.implementedEntryRef.dest == "BSW-MODULE-ENTRY")
+        assert(entity.implementedEntryRef.value == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
 
         assert(len(behavior.getBswTimingEvents()) == 1)
         event = behavior.getBswTimingEvents()[0]

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,5 +1,5 @@
 import filecmp
-from ....models.sw_component import CompositionSwComponentType
+from ....models.m2.autosar_templates.sw_component_template.composition import CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
 from ....models.ar_package import AUTOSAR
@@ -13,10 +13,10 @@ class TestSWComponents:
 
     def test_ar_packages(self):
         document = AUTOSAR.getInstance()
-        root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.short_name)
+        root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.getShortName())
 
         assert(len(root_pkgs) == 1)
-        assert("DemoApplication" == root_pkgs[0].short_name)
+        assert("DemoApplication" == root_pkgs[0].getShortName())
 
     def test_composition_sw_component_types(self):
         document = AUTOSAR.getInstance()

armodel/writer/abstract_arxml_writer.py

@@ -1,3 +1,4 @@
+import sys
 from abc import ABCMeta
 import re
 from xml.dom import minidom
@@ -111,7 +112,10 @@ class AbstractARXMLWriter:
         return xml
 
     def saveToFile(self, filename, root: ET.Element):
-        xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
+        if sys.version_info <= (3,9):
+            xml = ET.tostring(root, encoding = "UTF-8", short_empty_elements = False)
+        else:
+            xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
         
         dom = minidom.parseString(xml.decode())
         xml = dom.toprettyxml(indent = "  ", encoding = "UTF-8")