armodel 1.6.3__py3-none-any.whl → 1.6.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- armodel/cli/arxml_dump_cli.py +7 -7
- armodel/cli/arxml_format_cli.py +0 -1
- armodel/cli/connector2xlsx_cli.py +2 -3
- armodel/cli/connector_update_cli.py +1 -4
- armodel/cli/memory_section_cli.py +2 -2
- armodel/cli/swc_list_cli.py +2 -3
- armodel/cli/system_signal_cli.py +2 -2
- armodel/lib/sw_component.py +2 -2
- armodel/lib/system_signal.py +1 -3
- armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py +5 -10
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py +9 -11
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswImplementation.py +51 -12
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswInterfaces.py +3 -3
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswOverview.py +5 -6
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py +4 -1
- armodel/models/M2/AUTOSARTemplates/CommonStructure/Implementation.py +186 -29
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py +7 -10
- armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py +18 -7
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ModeDeclaration.py +3 -3
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py +3 -6
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/__init__.py +3 -5
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py +10 -6
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcBswMapping.py +3 -4
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/ModeDeclarationGroup.py +2 -5
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/__init__.py +0 -1
- armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/ExecutionOrderConstraint.py +45 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/TimingConstraint.py +24 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/TimingExtensions.py +33 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/TriggerDeclaration.py +2 -2
- armodel/models/M2/AUTOSARTemplates/CommonStructure/__init__.py +4 -6
- armodel/models/M2/AUTOSARTemplates/{ecuc_description_template.py → ECUCDescriptionTemplate.py} +6 -11
- armodel/models/M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py +3 -6
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py +40 -36
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/EngineeringObject.py +2 -5
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py +11 -16
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py +17 -2
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/__init__.py +0 -1
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py +1 -1
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/InstanceRefs.py +2 -4
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py +114 -12
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/InstanceRefs.py +2 -5
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/__init__.py +4 -62
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/DataPrototypes.py +6 -8
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py +7 -7
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/__init__.py +0 -1
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/{port_interface/instance_refs.py → PortInterface/InstanceRefs.py} +2 -2
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/{port_interface → PortInterface}/__init__.py +10 -10
- armodel/models/{rpt_scenario.py → M2/AUTOSARTemplates/SWComponentTemplate/RPTScenario.py} +4 -6
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcImplementation.py +29 -6
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py +6 -6
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/IncludedDataTypes.py +2 -2
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py +3 -3
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py +4 -4
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PerInstanceMemory.py +3 -3
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PortAPIOptions.py +86 -0
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/RTEEvents.py +174 -0
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServerCall.py +3 -4
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py +37 -3
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Trigger.py +2 -4
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/__init__.py +166 -10
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/{data_mapping.py → DataMapping.py} +2 -3
- armodel/models/{fibex/can_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanCommunication.py} +3 -4
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetFrame.py +14 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/ServiceInstances.py +116 -0
- armodel/models/{fibex/lin_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinCommunication.py} +4 -5
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/__init__.py +0 -0
- armodel/models/{fibex/fibex_4_multiplatform.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Multiplatform.py} +5 -6
- armodel/models/{fibex/fibex_core/core_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreCommunication.py} +4 -12
- armodel/models/{fibex/fibex_core/core_topology.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py} +6 -11
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/__init__.py +0 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/__init__.py +0 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/InstanceRefs.py +2 -2
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/{network_management.py → NetworkManagement.py} +5 -10
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/TransportProtocols.py +6 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py +3 -6
- armodel/models/M2/MSR/AsamHdo/AdminData.py +2 -5
- armodel/models/M2/MSR/AsamHdo/BaseTypes.py +3 -3
- armodel/models/M2/MSR/AsamHdo/ComputationMethod.py +5 -6
- armodel/models/M2/MSR/AsamHdo/Constraints/GlobalConstraints.py +3 -4
- armodel/models/M2/MSR/AsamHdo/Constraints/__init__.py +0 -1
- armodel/models/M2/MSR/AsamHdo/SpecialData.py +1 -4
- armodel/models/M2/MSR/AsamHdo/Units.py +3 -6
- armodel/models/M2/MSR/AsamHdo/__init__.py +0 -1
- armodel/models/M2/MSR/CalibrationData/CalibrationValue.py +3 -7
- armodel/models/M2/MSR/CalibrationData/__init__.py +0 -1
- armodel/models/M2/MSR/DataDictionary/AuxillaryObjects.py +3 -6
- armodel/models/M2/MSR/DataDictionary/Axis.py +3 -3
- armodel/models/M2/MSR/DataDictionary/CalibrationParameter.py +3 -3
- armodel/models/M2/MSR/DataDictionary/DataDefProperties.py +5 -6
- armodel/models/M2/MSR/DataDictionary/RecordLayout.py +4 -4
- armodel/models/M2/MSR/DataDictionary/__init__.py +0 -1
- armodel/models/M2/MSR/Documentation/Annotation.py +4 -6
- armodel/models/M2/MSR/Documentation/BlockElements.py +2 -2
- armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py +1 -2
- armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py +3 -6
- armodel/models/M2/MSR/Documentation/TextModel/__init__.py +0 -2
- armodel/models/M2/MSR/Documentation/__init__.py +1 -1
- armodel/models/M2/MSR/__init__.py +1 -1
- armodel/models/M2/__init__.py +0 -1
- armodel/models/__init__.py +46 -3
- armodel/parser/arxml_parser.py +58 -54
- armodel/parser/file_parser.py +2 -1
- armodel/report/connector_xls_report.py +2 -1
- armodel/tests/test_armodel/models/test_ar_object.py +0 -2
- armodel/tests/test_armodel/models/test_ar_package.py +4 -4
- armodel/tests/test_armodel/models/test_data_prototype.py +1 -1
- armodel/tests/test_armodel/models/test_datatype.py +7 -7
- armodel/tests/test_armodel/models/test_port_interface.py +6 -6
- armodel/tests/test_armodel/parser/test_parse_bswmd.py +12 -12
- armodel/tests/test_armodel/parser/test_sw_components.py +1 -1
- armodel/tests/test_armodel/parser/test_system.py +1 -1
- armodel/writer/arxml_writer.py +61 -49
- {armodel-1.6.3.dist-info → armodel-1.6.4.dist-info}/METADATA +371 -366
- armodel-1.6.4.dist-info/RECORD +156 -0
- {armodel-1.6.3.dist-info → armodel-1.6.4.dist-info}/WHEEL +1 -1
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/transport_protocols.py +0 -7
- armodel/models/sw_component.py +0 -390
- armodel/models/timing.py +0 -91
- armodel-1.6.3.dist-info/RECORD +0 -148
- /armodel/models/{fibex → M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint}/__init__.py +0 -0
- /armodel/models/{fibex/fibex_4_can → M2/AUTOSARTemplates/CommonStructure/Timing}/__init__.py +0 -0
- /armodel/models/{fibex/fibex_4_lin → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can}/__init__.py +0 -0
- /armodel/models/{fibex/fibex_core → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet}/__init__.py +0 -0
- {armodel-1.6.3.dist-info → armodel-1.6.4.dist-info}/LICENSE +0 -0
- {armodel-1.6.3.dist-info → armodel-1.6.4.dist-info}/entry_points.txt +0 -0
- {armodel-1.6.3.dist-info → armodel-1.6.4.dist-info}/top_level.txt +0 -0
armodel/cli/arxml_dump_cli.py
CHANGED
|
@@ -2,17 +2,17 @@ import getopt
|
|
|
2
2
|
import sys
|
|
3
3
|
import logging
|
|
4
4
|
|
|
5
|
+
from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
|
|
6
|
+
from ..models.M2.AUTOSARTemplates.CommonStructure import SwcInternalBehavior
|
|
7
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
5
8
|
from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
|
|
6
|
-
|
|
7
|
-
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import PPortPrototype, PortPrototype, RPortPrototype
|
|
8
|
-
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
|
|
9
9
|
from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior, BswModuleEntity
|
|
10
|
+
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import SenderReceiverInterface, ClientServerInterface
|
|
11
|
+
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import PPortPrototype, PortPrototype, RPortPrototype, SwComponentType
|
|
12
|
+
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
|
|
10
13
|
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import VariableAccess
|
|
11
14
|
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
|
|
12
|
-
from ..models import AUTOSAR, SwComponentType
|
|
13
|
-
from ..models import SwcInternalBehavior, ImplementationDataType
|
|
14
15
|
from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
|
|
15
|
-
from ..models import SenderReceiverInterface, ClientServerInterface
|
|
16
16
|
from ..parser import ARXMLParser
|
|
17
17
|
|
|
18
18
|
def show_variable_access(indent:int, variable_access: VariableAccess):
|
|
@@ -38,7 +38,7 @@ def show_port(indent:int, port_prototype: PortPrototype):
|
|
|
38
38
|
raise ValueError("Unsupported Port prototype")
|
|
39
39
|
|
|
40
40
|
def show_type(indent: int, data_type: ImplementationDataType):
|
|
41
|
-
print("%s-Implementation Type: %s (%s)" % (" " * indent, data_type.short_name, data_type.
|
|
41
|
+
print("%s-Implementation Type: %s (%s)" % (" " * indent, data_type.short_name, data_type.parent.full_name))
|
|
42
42
|
print("%s : %s" % (" " * indent, data_type.getCategory()))
|
|
43
43
|
if (data_type.getSwDataDefProps() != None):
|
|
44
44
|
if (data_type.getSwDataDefProps().getBaseTypeRef() != None):
|
armodel/cli/arxml_format_cli.py
CHANGED
|
@@ -4,9 +4,8 @@ import logging
|
|
|
4
4
|
import sys
|
|
5
5
|
import os.path
|
|
6
6
|
|
|
7
|
-
from
|
|
8
|
-
from
|
|
9
|
-
|
|
7
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
8
|
+
from ..parser import ARXMLParser
|
|
10
9
|
from ..lib import InputFileParser
|
|
11
10
|
from ..report import ConnectorXlsReport
|
|
12
11
|
|
|
@@ -4,14 +4,11 @@ import logging
|
|
|
4
4
|
import sys
|
|
5
5
|
import os.path
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
from ..writer.arxml_writer import ARXMLWriter
|
|
8
8
|
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
9
9
|
from ..parser.arxml_parser import ARXMLParser
|
|
10
10
|
from ..parser.connector_xlsx_parser import ConnectorXlsReader
|
|
11
11
|
|
|
12
|
-
from ..lib import InputFileParser
|
|
13
|
-
from ..writer import ARXMLWriter
|
|
14
|
-
|
|
15
12
|
def main():
|
|
16
13
|
version = pkg_resources.require("armodel")[0].version
|
|
17
14
|
|
|
@@ -4,8 +4,8 @@ import logging
|
|
|
4
4
|
import sys
|
|
5
5
|
import os.path
|
|
6
6
|
|
|
7
|
-
from
|
|
8
|
-
from
|
|
7
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
8
|
+
from ..parser import ARXMLParser
|
|
9
9
|
from ..lib import InputFileParser, SystemSignalAnalyzer
|
|
10
10
|
|
|
11
11
|
def main():
|
armodel/cli/swc_list_cli.py
CHANGED
|
@@ -4,9 +4,8 @@ import logging
|
|
|
4
4
|
import sys
|
|
5
5
|
import os.path
|
|
6
6
|
|
|
7
|
-
from
|
|
8
|
-
from
|
|
9
|
-
|
|
7
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
8
|
+
from ..parser import ARXMLParser
|
|
10
9
|
from ..lib import InputFileParser, SwComponentAnalyzer
|
|
11
10
|
|
|
12
11
|
def main():
|
armodel/cli/system_signal_cli.py
CHANGED
|
@@ -4,8 +4,8 @@ import logging
|
|
|
4
4
|
import sys
|
|
5
5
|
import os.path
|
|
6
6
|
|
|
7
|
-
from
|
|
8
|
-
from
|
|
7
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
8
|
+
from ..parser import ARXMLParser
|
|
9
9
|
from ..lib import InputFileParser, SystemSignalAnalyzer
|
|
10
10
|
|
|
11
11
|
def main():
|
armodel/lib/sw_component.py
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import logging
|
|
2
2
|
|
|
3
3
|
from typing import List
|
|
4
|
-
|
|
4
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
5
|
+
from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType, CompositionSwComponentType
|
|
5
6
|
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
|
|
6
|
-
from ..models import AUTOSAR, AtomicSwComponentType, CompositionSwComponentType
|
|
7
7
|
|
|
8
8
|
class SwComponentAnalyzer:
|
|
9
9
|
def __init__(self) -> None:
|
armodel/lib/system_signal.py
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import logging
|
|
2
2
|
from typing import List
|
|
3
|
-
|
|
3
|
+
from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import SystemSignal
|
|
4
4
|
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
|
|
5
|
-
|
|
6
5
|
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
7
|
-
from ..models.fibex.fibex_core.core_communication import SystemSignal
|
|
8
6
|
|
|
9
7
|
class SystemSignalAnalyzer:
|
|
10
8
|
def __init__(self) -> None:
|
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
from typing import Dict, List
|
|
2
|
-
|
|
3
|
-
from .
|
|
4
|
-
|
|
5
|
-
from
|
|
6
|
-
|
|
7
|
-
from .GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
|
|
8
|
-
from .GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
|
|
9
|
-
from .CommonStructure.ImplementationDataTypes import ImplementationDataType
|
|
10
|
-
from .GenericStructure.GeneralTemplateClasses.Identifiable import Referrable
|
|
11
|
-
from .SWComponentTemplate.Datatype.Datatypes import DataTypeMap
|
|
2
|
+
from ...M2.MSR.AsamHdo.BaseTypes import SwBaseType
|
|
3
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Referrable
|
|
4
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
|
|
5
|
+
from ...M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationDataType, DataTypeMap
|
|
6
|
+
from ...M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
|
|
12
7
|
|
|
13
8
|
class AbstractAUTOSAR(CollectableElement):
|
|
14
9
|
def __init__(self):
|
|
@@ -1,16 +1,14 @@
|
|
|
1
|
-
from
|
|
2
|
-
from
|
|
3
|
-
from
|
|
4
|
-
from
|
|
5
|
-
from
|
|
6
|
-
from
|
|
7
|
-
from
|
|
8
|
-
from
|
|
9
|
-
from
|
|
10
|
-
from ..GenericStructure.GeneralTemplateClasses.Identifiable import Referrable
|
|
1
|
+
from ....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
|
|
2
|
+
from ....M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
|
|
3
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, ARFloat, ARNumerical
|
|
5
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
6
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
7
|
+
from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
|
|
8
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Referrable
|
|
9
|
+
from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
|
|
11
10
|
from abc import ABCMeta
|
|
12
11
|
from typing import List
|
|
13
|
-
from armodel.models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
|
|
14
12
|
|
|
15
13
|
class BswModuleCallPoint(Referrable):
|
|
16
14
|
def __init__(self, parent: ARObject, short_name: str):
|
|
@@ -1,21 +1,60 @@
|
|
|
1
|
-
from
|
|
2
|
-
from
|
|
3
|
-
from
|
|
1
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, Identifier, RefType
|
|
3
|
+
from ....M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
|
|
4
4
|
from typing import List
|
|
5
5
|
|
|
6
6
|
class BswImplementation(Implementation):
|
|
7
7
|
def __init__(self, parent: ARObject, short_name: str) -> None:
|
|
8
8
|
super().__init__(parent, short_name)
|
|
9
9
|
|
|
10
|
-
self.
|
|
11
|
-
self.
|
|
12
|
-
self.
|
|
13
|
-
self.
|
|
14
|
-
self.vendorApiInfix = None # type:
|
|
15
|
-
self.
|
|
10
|
+
self.arReleaseVersion = None # type: RevisionLabelString
|
|
11
|
+
self.behaviorRef = None # type: RefType
|
|
12
|
+
self.preconfiguredConfigurationRefs = [] # type: List[RefType]
|
|
13
|
+
self.recommendedConfigurationRefs = [] # type: List[RefType]
|
|
14
|
+
self.vendorApiInfix = None # type: Identifier
|
|
15
|
+
self.vendorSpecificModuleDefRefs = [] # type: List[RefType]
|
|
16
16
|
|
|
17
|
-
def
|
|
18
|
-
self.
|
|
17
|
+
def getArReleaseVersion(self):
|
|
18
|
+
return self.arReleaseVersion
|
|
19
|
+
|
|
20
|
+
def setArReleaseVersion(self, value):
|
|
21
|
+
self.arReleaseVersion = value
|
|
22
|
+
return self
|
|
23
|
+
|
|
24
|
+
def getBehaviorRef(self):
|
|
25
|
+
return self.behaviorRef
|
|
26
|
+
|
|
27
|
+
def setBehaviorRef(self, value):
|
|
28
|
+
self.behaviorRef = value
|
|
29
|
+
return self
|
|
30
|
+
|
|
31
|
+
def getPreconfiguredConfigurationRefs(self):
|
|
32
|
+
return self.preconfiguredConfigurationRefs
|
|
33
|
+
|
|
34
|
+
def addPreconfiguredConfigurationRef(self, value):
|
|
35
|
+
self.preconfiguredConfigurationRefs.append(value)
|
|
36
|
+
return self
|
|
37
|
+
|
|
38
|
+
def getRecommendedConfigurationRefs(self):
|
|
39
|
+
return self.recommendedConfigurationRefs
|
|
40
|
+
|
|
41
|
+
def addRecommendedConfigurationRef(self, value):
|
|
42
|
+
self.recommendedConfigurationRefs.append(value)
|
|
43
|
+
return self
|
|
44
|
+
|
|
45
|
+
def getVendorApiInfix(self):
|
|
46
|
+
return self.vendorApiInfix
|
|
47
|
+
|
|
48
|
+
def setVendorApiInfix(self, value):
|
|
49
|
+
self.vendorApiInfix = value
|
|
50
|
+
return self
|
|
19
51
|
|
|
20
52
|
def getVendorSpecificModuleDefRefs(self):
|
|
21
|
-
return self.
|
|
53
|
+
return self.vendorSpecificModuleDefRefs
|
|
54
|
+
|
|
55
|
+
def addVendorSpecificModuleDefRef(self, value):
|
|
56
|
+
self.vendorSpecificModuleDefRefs.append(value)
|
|
57
|
+
return self
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
from
|
|
2
|
-
from
|
|
3
|
-
from
|
|
1
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
|
|
3
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, ARLiteral, ARNumerical
|
|
4
4
|
|
|
5
5
|
class BswModuleEntry(ARElement):
|
|
6
6
|
def __init__(self, parent: ARObject, short_name: str):
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
from
|
|
2
|
-
from
|
|
3
|
-
from
|
|
4
|
-
from
|
|
5
|
-
from
|
|
1
|
+
from ....M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior
|
|
2
|
+
from ....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
|
|
3
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
|
|
5
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger, RefType
|
|
6
6
|
from typing import Dict, List
|
|
7
7
|
|
|
8
|
-
|
|
9
8
|
class BswModuleDescription(ARElement):
|
|
10
9
|
'''
|
|
11
10
|
Root element for the description of a single BSW module or BSW cluster. In case it
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
from abc import ABCMeta
|
|
2
2
|
from typing import List
|
|
3
|
-
from .
|
|
4
|
-
from
|
|
5
|
-
from
|
|
6
|
-
from
|
|
7
|
-
from
|
|
3
|
+
from ....M2.AUTOSARTemplates.CommonStructure import ResourceConsumption
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject
|
|
5
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, PackageableElement, Referrable
|
|
6
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, RefType, ARLiteral, String
|
|
7
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
class ImplementationProps(Referrable, metaclass = ABCMeta):
|
|
@@ -40,42 +40,199 @@ class Code(Identifiable):
|
|
|
40
40
|
else:
|
|
41
41
|
return list(filter(lambda a: a.getCategory().getText() == category, self._artifactDescriptors))
|
|
42
42
|
|
|
43
|
+
class Compiler(Identifiable):
|
|
44
|
+
def __init__(self, parent: ARObject, short_name: str):
|
|
45
|
+
super().__init__(parent, short_name)
|
|
46
|
+
|
|
47
|
+
self.name = None # type: String
|
|
48
|
+
self.options = None # type: String
|
|
49
|
+
self.vendor = None # type: String
|
|
50
|
+
self.version = None # type: String
|
|
51
|
+
|
|
52
|
+
def getName(self):
|
|
53
|
+
return self.name
|
|
54
|
+
|
|
55
|
+
def setName(self, value):
|
|
56
|
+
self.name = value
|
|
57
|
+
return self
|
|
58
|
+
|
|
59
|
+
def getOptions(self):
|
|
60
|
+
return self.options
|
|
61
|
+
|
|
62
|
+
def setOptions(self, value):
|
|
63
|
+
self.options = value
|
|
64
|
+
return self
|
|
65
|
+
|
|
66
|
+
def getVendor(self):
|
|
67
|
+
return self.vendor
|
|
68
|
+
|
|
69
|
+
def setVendor(self, value):
|
|
70
|
+
self.vendor = value
|
|
71
|
+
return self
|
|
72
|
+
|
|
73
|
+
def getVersion(self):
|
|
74
|
+
return self.version
|
|
75
|
+
|
|
76
|
+
def setVersion(self, value):
|
|
77
|
+
self.version = value
|
|
78
|
+
return self
|
|
79
|
+
|
|
80
|
+
class DependencyOnArtifact(Identifiable):
|
|
81
|
+
def __init__(self, parent: ARObject, short_name: str):
|
|
82
|
+
super().__init__(parent, short_name)
|
|
83
|
+
|
|
84
|
+
# type: AutosarEngineeringObject
|
|
85
|
+
self.artifactDescriptor = None
|
|
86
|
+
self.usage = None # type: DependencyUsageEnum
|
|
43
87
|
|
|
44
|
-
|
|
45
|
-
|
|
88
|
+
def getArtifactDescriptor(self):
|
|
89
|
+
return self.artifactDescriptor
|
|
90
|
+
|
|
91
|
+
def setArtifactDescriptor(self, value):
|
|
92
|
+
self.artifactDescriptor = value
|
|
93
|
+
return self
|
|
94
|
+
|
|
95
|
+
def getUsage(self):
|
|
96
|
+
return self.usage
|
|
97
|
+
|
|
98
|
+
def setUsage(self, value):
|
|
99
|
+
self.usage = value
|
|
100
|
+
return self
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
class Implementation(PackageableElement, metaclass = ABCMeta):
|
|
104
|
+
def __init__(self, parent: ARObject, short_name: str):
|
|
46
105
|
if type(self) == Implementation:
|
|
47
106
|
raise NotImplementedError("Implementation is an abstract class.")
|
|
48
107
|
|
|
49
108
|
super().__init__(parent, short_name)
|
|
50
109
|
|
|
51
|
-
self.
|
|
52
|
-
self.
|
|
53
|
-
self.
|
|
54
|
-
self.
|
|
55
|
-
self.
|
|
56
|
-
self.
|
|
57
|
-
self.
|
|
58
|
-
self.
|
|
59
|
-
self.
|
|
60
|
-
self.
|
|
61
|
-
self.
|
|
62
|
-
self.
|
|
63
|
-
self.
|
|
64
|
-
self.
|
|
110
|
+
self.buildActionManifestRef = None # type: RefType
|
|
111
|
+
self.codeDescriptors = [] # type: List[Code]
|
|
112
|
+
self.compilers = [] # type: List[Compiler]
|
|
113
|
+
self.generatedArtifacts = [] # type: List[DependencyOnArtifact]
|
|
114
|
+
self.hwElementRefs = [] # type: List[RefType]
|
|
115
|
+
self.linkers = [] # type: List[Linker]
|
|
116
|
+
self.mcSupport = None
|
|
117
|
+
self.programmingLanguage = None # type: ProgramminglanguageEnum
|
|
118
|
+
self.requiredArtifacts = [] # type: List[DependencyOnArtifact]
|
|
119
|
+
self.requiredGeneratorTools = [] # type: List[DependencyOnArtifact]
|
|
120
|
+
self.resourceConsumption = None # type: ResourceConsumption
|
|
121
|
+
self.swcBswMappingRef = None # type: RefType
|
|
122
|
+
self.swVersion = [] # type: RevisionLabelString
|
|
123
|
+
self.usedCodeGenerator = None # type: String
|
|
124
|
+
self.vendorId = 0 # type: PositiveInteger
|
|
125
|
+
|
|
126
|
+
def getBuildActionManifestRef(self):
|
|
127
|
+
return self.buildActionManifestRef
|
|
128
|
+
|
|
129
|
+
def setBuildActionManifestRef(self, value):
|
|
130
|
+
self.buildActionManifestRef = value
|
|
131
|
+
return self
|
|
132
|
+
|
|
133
|
+
def getCodeDescriptors(self)-> List[Code]:
|
|
134
|
+
return list(filter(lambda a : isinstance(a, Code), self.elements.values()))
|
|
65
135
|
|
|
66
136
|
def createCodeDescriptor(self, short_name: str) -> Code:
|
|
67
137
|
if (short_name not in self.elements):
|
|
68
|
-
|
|
69
|
-
self.
|
|
70
|
-
|
|
138
|
+
code_descriptor = Code(self, short_name)
|
|
139
|
+
self.addElement(code_descriptor)
|
|
140
|
+
self.codeDescriptors.append(code_descriptor)
|
|
141
|
+
return self.getElement(short_name)
|
|
71
142
|
|
|
72
|
-
def
|
|
73
|
-
return
|
|
143
|
+
def getCompilers(self):
|
|
144
|
+
return self.compilers
|
|
145
|
+
|
|
146
|
+
def setCompilers(self, value):
|
|
147
|
+
self.compilers = value
|
|
148
|
+
return self
|
|
149
|
+
|
|
150
|
+
def getGeneratedArtifacts(self):
|
|
151
|
+
return self.generatedArtifacts
|
|
152
|
+
|
|
153
|
+
def setGeneratedArtifacts(self, value):
|
|
154
|
+
self.generatedArtifacts = value
|
|
155
|
+
return self
|
|
156
|
+
|
|
157
|
+
def getHwElementRefs(self):
|
|
158
|
+
return self.hwElementRefs
|
|
159
|
+
|
|
160
|
+
def setHwElementRefs(self, value):
|
|
161
|
+
self.hwElementRefs = value
|
|
162
|
+
return self
|
|
163
|
+
|
|
164
|
+
def getLinkers(self):
|
|
165
|
+
return self.linkers
|
|
166
|
+
|
|
167
|
+
def setLinkers(self, value):
|
|
168
|
+
self.linkers = value
|
|
169
|
+
return self
|
|
170
|
+
|
|
171
|
+
def getMcSupport(self):
|
|
172
|
+
return self.mcSupport
|
|
173
|
+
|
|
174
|
+
def setMcSupport(self, value):
|
|
175
|
+
self.mcSupport = value
|
|
176
|
+
return self
|
|
177
|
+
|
|
178
|
+
def getProgrammingLanguage(self):
|
|
179
|
+
return self.programmingLanguage
|
|
180
|
+
|
|
181
|
+
def setProgrammingLanguage(self, value):
|
|
182
|
+
self.programmingLanguage = value
|
|
183
|
+
return self
|
|
184
|
+
|
|
185
|
+
def getRequiredArtifacts(self):
|
|
186
|
+
return self.requiredArtifacts
|
|
187
|
+
|
|
188
|
+
def setRequiredArtifacts(self, value):
|
|
189
|
+
self.requiredArtifacts = value
|
|
190
|
+
return self
|
|
191
|
+
|
|
192
|
+
def getRequiredGeneratorTools(self):
|
|
193
|
+
return self.requiredGeneratorTools
|
|
194
|
+
|
|
195
|
+
def setRequiredGeneratorTools(self, value):
|
|
196
|
+
self.requiredGeneratorTools = value
|
|
197
|
+
return self
|
|
198
|
+
|
|
199
|
+
def getResourceConsumption(self):
|
|
200
|
+
return self.resourceConsumption
|
|
74
201
|
|
|
75
202
|
def setResourceConsumption(self, consumption: ResourceConsumption):
|
|
76
203
|
self.elements[consumption.short_name] = consumption
|
|
77
|
-
self.
|
|
204
|
+
self.resourceConsumption = consumption
|
|
205
|
+
return self
|
|
206
|
+
|
|
207
|
+
def getSwcBswMappingRef(self):
|
|
208
|
+
return self.swcBswMappingRef
|
|
209
|
+
|
|
210
|
+
def setSwcBswMappingRef(self, value):
|
|
211
|
+
self.swcBswMappingRef = value
|
|
212
|
+
return self
|
|
213
|
+
|
|
214
|
+
def getSwVersion(self):
|
|
215
|
+
return self.swVersion
|
|
216
|
+
|
|
217
|
+
def setSwVersion(self, value):
|
|
218
|
+
self.swVersion = value
|
|
78
219
|
return self
|
|
79
220
|
|
|
80
|
-
def
|
|
81
|
-
return self.
|
|
221
|
+
def getUsedCodeGenerator(self):
|
|
222
|
+
return self.usedCodeGenerator
|
|
223
|
+
|
|
224
|
+
def setUsedCodeGenerator(self, value):
|
|
225
|
+
self.usedCodeGenerator = value
|
|
226
|
+
return self
|
|
227
|
+
|
|
228
|
+
def getVendorId(self):
|
|
229
|
+
return self.vendorId
|
|
230
|
+
|
|
231
|
+
def setVendorId(self, value):
|
|
232
|
+
self.vendorId = value
|
|
233
|
+
return self
|
|
234
|
+
|
|
235
|
+
|
|
236
|
+
|
|
237
|
+
|
|
238
|
+
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
from abc import ABCMeta
|
|
2
2
|
from typing import List
|
|
3
|
-
|
|
4
|
-
from
|
|
5
|
-
|
|
6
|
-
from
|
|
7
|
-
|
|
8
|
-
from
|
|
9
|
-
from
|
|
10
|
-
from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
|
|
11
|
-
from ..SWComponentTemplate.Datatype.Datatypes import AutosarDataType
|
|
12
|
-
from ..SWComponentTemplate.Components import SymbolProps
|
|
3
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
|
|
5
|
+
from ....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
|
|
6
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
7
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
|
|
8
|
+
from ....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import AutosarDataType
|
|
9
|
+
from ....M2.AUTOSARTemplates.SWComponentTemplate.Components import SymbolProps
|
|
13
10
|
|
|
14
11
|
class AbstractImplementationDataTypeElement(Identifiable):
|
|
15
12
|
def __init__(self, parent, short_name: str):
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
from abc import ABCMeta
|
|
2
2
|
from enum import Enum
|
|
3
3
|
from typing import List
|
|
4
|
-
|
|
5
|
-
from
|
|
6
|
-
from
|
|
7
|
-
from
|
|
8
|
-
from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
5
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
6
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType
|
|
7
|
+
from ....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype
|
|
9
8
|
|
|
10
9
|
class ReentrancyLevelEnum(Enum):
|
|
11
|
-
|
|
12
10
|
multicoreReentrant = "multicoreReentrant"
|
|
13
11
|
nonReentrant = "nonReentrant"
|
|
14
12
|
singleCoreReentrant = "singleCoreReentrant"
|
|
@@ -105,4 +103,17 @@ class InternalBehavior(Identifiable, metaclass=ABCMeta):
|
|
|
105
103
|
return self.elements[short_name]
|
|
106
104
|
|
|
107
105
|
def getConstantMemorys(self) -> List[ParameterDataPrototype]:
|
|
108
|
-
return self.constant_memories
|
|
106
|
+
return self.constant_memories
|
|
107
|
+
|
|
108
|
+
class AbstractEvent(Identifiable):
|
|
109
|
+
def __init__(self, parent: ARObject, short_name: str):
|
|
110
|
+
super().__init__(parent, short_name)
|
|
111
|
+
|
|
112
|
+
self.activationReasonRepresentationRef = None # type: RefType
|
|
113
|
+
|
|
114
|
+
def getActivationReasonRepresentationRef(self):
|
|
115
|
+
return self.activationReasonRepresentationRef
|
|
116
|
+
|
|
117
|
+
def setActivationReasonRepresentationRef(self, value):
|
|
118
|
+
self.activationReasonRepresentationRef = value
|
|
119
|
+
return self
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from typing import List
|
|
2
|
-
from
|
|
3
|
-
from
|
|
4
|
-
from
|
|
2
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
3
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
4
|
+
from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType, TRefType
|
|
5
5
|
|
|
6
6
|
class ModeDeclaration(Identifiable):
|
|
7
7
|
def __init__(self, parent: ARObject, short_name: str):
|
armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
from
|
|
2
|
-
from
|
|
3
|
-
from
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
3
|
+
from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
|
|
6
4
|
import re
|
|
7
5
|
from typing import List
|
|
8
6
|
|
|
9
|
-
|
|
10
7
|
class MemorySection(Identifiable):
|
|
11
8
|
def __init__(self, parent: ARObject, short_name: str):
|
|
12
9
|
super().__init__(parent, short_name)
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
from . import
|
|
2
|
-
|
|
3
|
-
from .
|
|
4
|
-
from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
5
|
-
from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
1
|
+
from .....M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import MemorySection
|
|
2
|
+
from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
3
|
+
from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
6
4
|
from typing import List
|
|
7
5
|
|
|
8
6
|
class ResourceConsumption(Identifiable):
|