armodel 1.6.0__py3-none-any.whl → 1.6.2__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/report/connector_xls_report.py

@@ -1,5 +1,6 @@
+from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
 from .excel_report import ExcelReporter
-from ..models import AUTOSAR, ARPackage, CompositionSwComponentType
+from ..models import AUTOSAR, CompositionSwComponentType
 from ..models import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
 from typing import List
 

armodel/tests/test_armodel/models/test_ar_package.py

@@ -1,12 +1,15 @@
 """ Test AR Package """
 import pytest
 
-from ....models.ar_package import AUTOSAR
-from ....models.datatype import ApplicationPrimitiveDataType, ApplicationRecordDataType, DataTypeMappingSet, ImplementationDataType, SwBaseType
+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.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
+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.m2.autosar_templates.sw_component_template.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
-from ....models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, ServiceSwComponentType, SwComponentType
+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
 
 
@@ -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_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.m2.autosar_templates.common_structure import ConstantReference, ConstantSpecification, ValueSpecification
-from ....models.common_structure import AbstractImplementationDataTypeElement, ImplementationDataTypeElement, ExecutableEntity
+from ....models.common_structure import ExecutableEntity
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable
 from ....models.general_structure import MultilanguageReferrable, PackageableElement, Referrable
 
@@ -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_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:

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):
@@ -226,8 +226,8 @@ 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.subElements == [])
+        assert(data_type.symbolProps == None)
         assert(data_type._type_emitter == None)
 
         element = data_type.createImplementationDataTypeElement("ImplementationDataTypeElement")

armodel/tests/test_armodel/models/test_general_structure.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.ar_package import AUTOSAR
+from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 from ....models.general_structure import ARElement, ARObject, AtpFeature, CollectableElement, Identifiable, Limit, MultilanguageReferrable, PackageableElement, Referrable
 
 class TestGeneralStructure:

armodel/tests/test_armodel/models/test_implementation.py

@@ -1,6 +1,6 @@
 
 from ....models.implementation import AutosarEngineeringObject, Code
-from ....models.ar_package import AUTOSAR
+from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 
 
 class TestImplementation:

armodel/tests/test_armodel/models/test_port_interface.py

@@ -1,8 +1,8 @@
 import pytest
 
-from ....models.ar_package import AUTOSAR
+from ....models.m2.autosar_templates.autosar_top_level_structure 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.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface

armodel/tests/test_armodel/parser/test_parse_bswmd.py

@@ -1,6 +1,8 @@
 import filecmp
 
-from .... import AUTOSAR, ARPackage
+from ....models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+
+from .... import AUTOSAR
 from .... import ARXMLParser, ARXMLWriter
 
 import logging

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,8 +1,8 @@
 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
+from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 
 class TestSWComponents:
     def setup_method(self):

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")

armodel/writer/arxml_writer.py

@@ -2,6 +2,10 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
+from armodel.models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataType
+
+
+
 from ..models.m2.msr.data_dictionary.auxillary_objects import SwAddrMethod
 from ..models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps
 from ..models.m2.msr.asam_hdo.units import PhysicalDimension
@@ -9,16 +13,24 @@ from ..models.m2.msr.documentation.block_elements import DocumentationBlock
 from ..models.m2_msr import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
 
 from ..models.m2.autosar_templates.common_structure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
-from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
+from ..models.m2.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.m2.autosar_templates.generic_structure.abstract_structure import AnyInstanceRef
+from ..models.m2.autosar_templates.sw_component_template.components import PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
+from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior import RunnableEntityArgument, SynchronousServerCallPoint
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.server_call import ServerCallPoint
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.data_elements import ParameterAccess, VariableAccess
-from ..models.m2.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.m2.autosar_templates.sw_component_template.composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwConnector
+from ..models.m2.autosar_templates.sw_component_template.composition.instance_refs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
+from ..models.m2.autosar_templates.sw_component_template.port_interface.instance_refs import ApplicationCompositeElementInPortInterfaceInstanceRef
+from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
+from ..models.m2.autosar_templates.system_template.instance_refs import VariableDataPrototypeInSystemInstanceRef
+from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
 from ..models.m2.autosar_templates.system_template.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
 from ..models.m2.autosar_templates.system_template import System, SystemMapping
 from ..models.m2.autosar_templates.system_template.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
 from ..models.m2.autosar_templates.system_template.transport_protocols import CanTpConfig
-from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
+from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
 
 from ..models.fibex.fibex_4_multiplatform import Gateway, ISignalMapping
 from ..models.fibex.can_communication import CanFrame, CanFrameTriggering, RxIdentifierRange
@@ -33,20 +45,18 @@ from ..models.multilanguage_data import MultiLanguageOverviewParagraph, MultiLan
 from ..models.record_layout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.service_mapping import RoleBasedPortAssignment
 from ..models.service_needs import NvBlockNeeds, RoleBasedDataAssignment
-from ..models.data_prototype import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
+from ..models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
 from ..models.bsw_module_template import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleDescription, BswModuleEntity, BswModuleEntry, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
-from ..models.ar_package import AUTOSAR
-from ..models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, PortGroup, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
-from ..models.ar_package import ARPackage
-from ..models.ar_ref import AnyInstanceRef, ApplicationCompositeElementInPortInterfaceInstanceRef, AutosarParameterRef, AutosarVariableRef, InnerPortGroupInCompositionInstanceRef, POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef, RefType, VariableDataPrototypeInSystemInstanceRef
+from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
+from ..models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
+from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+from ..models.ar_ref import RefType
 from ..models.calibration import SwAxisGrouped, SwAxisIndividual, SwCalprmAxis, SwCalprmAxisSet, SwValueCont, SwValues
 from ..models.common_structure import IncludedModeDeclarationGroupSet, ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype
 from ..models.communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, BaseTypeDirectDefinition, DataTypeMappingSet, ImplementationDataType, SwBaseType
+from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, BaseTypeDirectDefinition, DataTypeMappingSet, SwBaseType
 from ..models.general_structure import ARElement, AdminData, Identifiable, Limit, MultilanguageReferrable, Referrable, Sdg, SwcBswMapping, SwcBswRunnableMapping
 
-from ..models.port_prototype import PPortPrototype, PortPrototype, RPortPrototype
-from ..models.sw_component import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwComponentType, SwConnector
 from ..models.annotation import Annotation
 from ..models.end_to_end_protection import EndToEndDescription, EndToEndProtection, EndToEndProtectionSet, EndToEndProtectionVariablePrototype
 from ..models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, PortInterface, SenderReceiverInterface, TriggerInterface
@@ -331,7 +341,14 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeClientComSpec")
         child_element = ET.SubElement(element, "CLIENT-COM-SPEC")
         self.setARObjectAttributes(child_element, com_spec)
-        self.setChildElementOptionalRefType(child_element, "OPERATION-REF", com_spec.operationRef)
+        self.setChildElementOptionalRefType(child_element, "OPERATION-REF", com_spec.getOperationRef())
+
+    def writeParameterRequireComSpec(self, element: ET.Element, com_spec: ParameterRequireComSpec):
+        self.logger.debug("writeParameterRequireComSpec")
+        child_element = ET.SubElement(element, "PARAMETER-REQUIRE-COM-SPEC")
+        self.setARObjectAttributes(child_element, com_spec)
+        self.setChildElementOptionalRefType(child_element, "PARAMETER-REF", com_spec.parameter_ref)
+        self.setInitValue(child_element, com_spec.init_value)
 
     def writeModeSwitchReceiverComSpec(self, element: ET.Element, com_spec: ModeSwitchReceiverComSpec):
         self.logger.debug("writeModeSwitchReceiverComSpec")
@@ -348,6 +365,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeClientComSpec(element, com_spec)
         elif isinstance(com_spec, ModeSwitchReceiverComSpec):
             self.writeModeSwitchReceiverComSpec(element, com_spec)
+        elif isinstance(com_spec, ParameterRequireComSpec):
+            self.writeParameterRequireComSpec(element, com_spec)
         else:
             raise ValueError("Unsupported RPortComSpec %s" % type(com_spec))
     
@@ -363,7 +382,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             for com_spec in com_specs:
                 self.writePPortComSpec(com_specs_tag, com_spec)
 
-        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.provided_interface_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.getProvidedInterfaceTRef())
 
     def writeRPortPrototype(self, ports_tag: ET.Element, prototype: RPortPrototype):
         self.logger.debug("writeRPortPrototype %s" % prototype.short_name)
@@ -374,7 +393,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             com_specs_tag = ET.SubElement(prototype_tag, "REQUIRED-COM-SPECS")
             for com_spec in com_specs:
                 self.writeRPortComSpec(com_specs_tag, com_spec)
-        self.setChildElementOptionalRefType(prototype_tag, "REQUIRED-INTERFACE-TREF", prototype.required_interface_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "REQUIRED-INTERFACE-TREF", prototype.getRequiredInterfaceTRef())
     
     def writePortPrototypes(self, ports_tag: ET.Element, port_prototypes: List[PortPrototype]):
         for port_prototype in port_prototypes:
@@ -387,8 +406,8 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def writeInnerGroupIRef(self, element: ET.Element, inner_group_iref: InnerPortGroupInCompositionInstanceRef):
         child_element = ET.SubElement(element, "INNER-GROUP-IREF")
-        self.setChildElementOptionalRefType(child_element, "CONTEXT-REF", inner_group_iref.contextRef)
-        self.setChildElementOptionalRefType(child_element, "TARGET-REF", inner_group_iref.targetRef)
+        #self.setChildElementOptionalRefType(child_element, "CONTEXT-REF", inner_group_iref.contextRef)
+        self.setChildElementOptionalRefType(child_element, "TARGET-REF", inner_group_iref.getTargetRef())
 
     def writePortGroupInnerGroupIRefs(self, element: ET.Element, parent: PortGroup):
         irefs = parent.getInnerGroupIRefs()
@@ -430,48 +449,53 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeSwComponentPrototype(self, element: ET.Element, prototype: SwComponentPrototype):
         prototype_tag = ET.SubElement(element, "SW-COMPONENT-PROTOTYPE")
         self.setIdentifiable(prototype_tag, prototype)
-        self.setChildElementOptionalRefType(prototype_tag, "TYPE-TREF", prototype.type_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "TYPE-TREF", prototype.getTypeTRef())
 
     def writeSwComponentPrototypes(self, element: ET.Element, sw_component: CompositionSwComponentType):
-        components_tag = ET.SubElement(element, "COMPONENTS")
-        for prototype in sw_component.getSwComponentPrototypes():
+        prototypes = sw_component.getSwComponentPrototypes()
+        if len(prototypes) > 0:
+            components_tag = ET.SubElement(element, "COMPONENTS")
+        for prototype in prototypes:
             self.writeSwComponentPrototype(components_tag, prototype)
 
     def writeAssemblySwConnector(self, element: ET.Element, sw_connector: AssemblySwConnector):
         connector_tag = ET.SubElement(element, "ASSEMBLY-SW-CONNECTOR")
         self.setIdentifiable(connector_tag, sw_connector)
 
-        if sw_connector.provider_iref is not None:
+        if sw_connector.getProviderIRef() is not None:
             provider_iref_tag = ET.SubElement(connector_tag, "PROVIDER-IREF")
-            self.setARObjectAttributes(provider_iref_tag, sw_connector.provider_iref)
-            self.setChildElementOptionalRefType(provider_iref_tag, "CONTEXT-COMPONENT-REF", sw_connector.provider_iref.context_component_ref)
-            self.setChildElementOptionalRefType(provider_iref_tag, "TARGET-P-PORT-REF", sw_connector.provider_iref.target_p_port_ref)
+            provider_iref = sw_connector.getProviderIRef()
+            self.setARObjectAttributes(provider_iref_tag, provider_iref)
+            self.setChildElementOptionalRefType(provider_iref_tag, "CONTEXT-COMPONENT-REF", provider_iref.getContextComponentRef())
+            self.setChildElementOptionalRefType(provider_iref_tag, "TARGET-P-PORT-REF", provider_iref.getTargetPPortRef())
 
-        if sw_connector.requester_iref is not None:
+        if sw_connector.getRequesterIRef() is not None:
             requester_iref_tag = ET.SubElement(connector_tag, "REQUESTER-IREF")
-            self.setARObjectAttributes(requester_iref_tag, sw_connector.requester_iref)
-            self.setChildElementOptionalRefType(requester_iref_tag, "CONTEXT-COMPONENT-REF", sw_connector.requester_iref.context_component_ref)
-            self.setChildElementOptionalRefType(requester_iref_tag, "TARGET-R-PORT-REF", sw_connector.requester_iref.target_r_port_ref)
+            requester_iref = sw_connector.getRequesterIRef()
+            self.setARObjectAttributes(requester_iref_tag, requester_iref)
+            self.setChildElementOptionalRefType(requester_iref_tag, "CONTEXT-COMPONENT-REF", requester_iref.getContextComponentRef())
+            self.setChildElementOptionalRefType(requester_iref_tag, "TARGET-R-PORT-REF", requester_iref.getTargetRPortRef())
 
     def writeDelegationSwConnector(self, element: ET.Element, sw_connector: DelegationSwConnector):
         connector_tag = ET.SubElement(element, "DELEGATION-SW-CONNECTOR")
         self.setIdentifiable(connector_tag, sw_connector)
 
-        if sw_connector.inner_port_iref is not None:
+        if sw_connector.getInnerPortIRref() is not None:
             inner_port_iref_tag = ET.SubElement(connector_tag, "INNER-PORT-IREF")
-            if isinstance(sw_connector.inner_port_iref, PPortInCompositionInstanceRef):
+            inner_port_iref = sw_connector.getInnerPortIRref()
+            if isinstance(inner_port_iref, PPortInCompositionInstanceRef):
                 instance_ref_tag = ET.SubElement(inner_port_iref_tag, "P-PORT-IN-COMPOSITION-INSTANCE-REF")
-                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", sw_connector.inner_port_iref.context_component_ref)
-                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-P-PORT-REF", sw_connector.inner_port_iref.target_p_port_ref)
-            elif isinstance(sw_connector.inner_port_iref, RPortInCompositionInstanceRef):
+                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", inner_port_iref.getContextComponentRef())
+                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-P-PORT-REF", inner_port_iref.getTargetPPortRef())
+            elif isinstance(inner_port_iref, RPortInCompositionInstanceRef):
                 instance_ref_tag = ET.SubElement(inner_port_iref_tag, "R-PORT-IN-COMPOSITION-INSTANCE-REF")
-                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", sw_connector.inner_port_iref.context_component_ref)
-                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-R-PORT-REF", sw_connector.inner_port_iref.target_r_port_ref)
+                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", inner_port_iref.getContextComponentRef())
+                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-R-PORT-REF", inner_port_iref.getTargetRPortRef())
             else:
-                self._raiseError("Invalid inner port of DelegationSwConnector <%s>" % sw_connector.short_name)
+                self._raiseError("Invalid inner port of DelegationSwConnector <%s>" % sw_connector.getShortName())
 
-        if sw_connector.outer_port_ref is not None:
-            self.setChildElementOptionalRefType(connector_tag, "OUTER-PORT-REF", sw_connector.outer_port_ref)
+        if sw_connector.getOuterPortRef() is not None:
+            self.setChildElementOptionalRefType(connector_tag, "OUTER-PORT-REF", sw_connector.getOuterPortRef())
             #self.writeChildOptionalRefElement(requester_iref_tag, "TARGET-R-PORT-REF", sw_connector.requester_iref.target_r_port_ref)
         
     def writeSwConnector(self, element: ET.Element, sw_connector: SwConnector):
@@ -486,8 +510,13 @@ class ARXMLWriter(AbstractARXMLWriter):
         sw_connectors = sw_component.getSwConnectors()
         if len(sw_connectors) > 0:
             connectors_tag = ET.SubElement(element, "CONNECTORS")
+            # Change the implementation to compatible with AUTOSAR builder
             for sw_connector in sw_connectors:
                 self.writeSwConnector(connectors_tag, sw_connector)
+            #for sw_connector in sw_component.getAssemblySwConnectors():
+            #    self.writeSwConnector(connectors_tag, sw_connector)
+            #for sw_connector in sw_component.getDelegationSwConnectors():
+            #    self.writeSwConnector(connectors_tag, sw_connector)
 
     def writeCompositionSwComponentTypeDataTypeMappingSet(self, element: ET.Element, parent: CompositionSwComponentType):
         data_type_mappings = parent.getDataTypeMappings()
@@ -691,6 +720,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         for compu_scale in compu_scales.getCompuScales():
             child_element = ET.SubElement(compu_scales_tag, "COMPU-SCALE")
             self.setARObjectAttributes(child_element, compu_scale)
+            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", compu_scale.short_label)
             self.setChildElementOptionalLiteral(child_element, "SYMBOL", compu_scale.symbol)
             self.writeChildLimitElement(child_element, "LOWER-LIMIT", compu_scale.lowerLimit)
             self.writeChildLimitElement(child_element, "UPPER-LIMIT", compu_scale.upperLimit)
@@ -1416,9 +1446,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeSenderReceiverInterface %s" % sr_interface.short_name)
         child_element = ET.SubElement(element, "SENDER-RECEIVER-INTERFACE")
         self.setIdentifiable(child_element, sr_interface)
-        self.setChildElementOptionalBooleanValue(child_element, "IS-SERVICE", sr_interface.isService)
+        self.setChildElementOptionalBooleanValue(child_element, "IS-SERVICE", sr_interface.getIsService())
         self.writeSenderReceiverInterfaceDataElements(child_element, sr_interface)
-        self.writeSenderReceiverInterfaceInvalidationPolicies(child_element, sr_interface)
 
     def writerBswModuleDescriptionImplementedEntry(self, element: ET.Element, desc: BswModuleDescription):
         entries = desc.getImplementedEntries()
@@ -1651,7 +1680,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setIdentifiable(child_element, type_element)
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE", type_element.getArraySize())
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE-SEMANTICS", type_element.getArraySizeSemantics())
-                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", type_element.swDataDefProps)
+                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", type_element.getSwDataDefProps())
 
     def writeImplementationDataType(self, element: ET.Element, data_type: ImplementationDataType):
         self.logger.debug("writeImplementationDataType %s" % data_type.short_name)
@@ -1670,6 +1699,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", prototype.swDataDefProps)
                 self.setChildElementOptionalRefType(child_element, "TYPE-TREF", prototype.typeTRef)
                 self.setChildElementOptionalLiteral(child_element, "DIRECTION", prototype.direction)
+                self.setChildElementOptionalLiteral(child_element, "SERVER-ARGUMENT-IMPL-POLICY", prototype.server_argument_impl_policy)
 
     def writePossibleErrorRefs(self, element: ET.Element, parent: ClientServerOperation):
         error_refs = parent.getPossbileErrorRefs()
@@ -2565,26 +2595,6 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeGateway(element, ar_element)
         elif isinstance(ar_element, ISignal):
             self.writeISignal(element, ar_element)
-        elif isinstance(ar_element, EcucValueCollection):
-            self.writeEcucValueCollection(element, ar_element)
-        elif isinstance(ar_element, EcucModuleConfigurationValues):
-            self.writeEcucModuleConfigurationValues(element, ar_element)
-        elif isinstance(ar_element, ISignalGroup):
-            self.writeISignalGroup(element, ar_element)
-        elif isinstance(ar_element, ISignalIPduGroup):
-            self.writeISignalIPduGroup(element, ar_element)
-        elif isinstance(ar_element, SystemSignal):
-            self.writeSystemSignal(element, ar_element)
-        elif isinstance(ar_element, ISignalIPdu):
-            self.writeISignalIPdu(element, ar_element)
-        elif isinstance(ar_element, EcuInstance):
-            self.writeEcuInstance(element, ar_element)
-        elif isinstance(ar_element, SystemSignalGroup):
-            self.writeSystemSignalGroup(element, ar_element)
-        elif isinstance(ar_element, System):
-            self.writeSystem(element, ar_element)
-        elif isinstance(ar_element, PhysicalDimension):
-            self.writePhysicalDimension(element, ar_element)
         else:
             raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
         

{armodel-1.6.0.dist-info → armodel-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.6.0
+Version: 1.6.2
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -349,4 +349,8 @@ Fix the attribute intervalType of **Limit** is empty issue.
    * MODE-SWITCH-POINTS
  4. Create the CLI (armodel-system-signal) to list all the system signals
 
+**Version 1.6.1**
+
+1. Organize the armodel package.
+2. Add the Get/Set method for several class.