armodel 1.7.9__py3-none-any.whl → 1.8.0__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_format_cli.py +1 -0
- armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py +50 -11
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py +30 -28
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py +5 -0
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py +5 -0
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py +19 -9
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/DataMapping.py +11 -10
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py +8 -2
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/RteEventToOsTaskMapping.py +35 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/SWmapping.py +25 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/SecureCommunication.py +83 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py +84 -32
- armodel/models/__init__.py +2 -0
- armodel/models/utils/__init__.py +0 -0
- armodel/models/utils/uuid_mgr.py +23 -0
- armodel/parser/abstract_arxml_parser.py +5 -0
- armodel/parser/arxml_parser.py +80 -69
- armodel/tests/test_armodel/models/test_datatype.py +136 -138
- armodel/writer/arxml_writer.py +38 -28
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/METADATA +15 -1
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/RECORD +25 -21
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/LICENSE +0 -0
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/WHEEL +0 -0
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/entry_points.txt +0 -0
- {armodel-1.7.9.dist-info → armodel-1.8.0.dist-info}/top_level.txt +0 -0
armodel/parser/arxml_parser.py
CHANGED
|
@@ -53,7 +53,7 @@ from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import Res
|
|
|
53
53
|
from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import MemorySection
|
|
54
54
|
from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import RoughEstimateStackUsage, StackUsage
|
|
55
55
|
from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
|
|
56
|
-
from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagEventDebounceMonitorInternal
|
|
56
|
+
from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagEventDebounceMonitorInternal, DltUserNeeds, ServiceNeeds
|
|
57
57
|
from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticCapabilityElement, DtcStatusChangeNotificationNeeds
|
|
58
58
|
from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticCommunicationManagerNeeds, DiagnosticEventInfoNeeds
|
|
59
59
|
from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds
|
|
@@ -367,7 +367,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
367
367
|
for child_element in self.findall(element, "%s/VARIABLE-ACCESS" % key):
|
|
368
368
|
short_name = self.getShortName(child_element)
|
|
369
369
|
|
|
370
|
-
self.logger.debug("
|
|
370
|
+
# self.logger.debug("Read VariableAccesses %s" % short_name)
|
|
371
371
|
|
|
372
372
|
if (key == "DATA-RECEIVE-POINT-BY-ARGUMENTS"):
|
|
373
373
|
variable_access = parent.createDataReceivePointByArgument(short_name)
|
|
@@ -400,7 +400,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
400
400
|
ref = self.getChildElementOptionalRefType(child_element, "BSW-MODULE-ENTRY-REF")
|
|
401
401
|
if (ref is not None):
|
|
402
402
|
parent.addImplementedEntryRef(ref)
|
|
403
|
-
self.logger.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.getShortName())
|
|
403
|
+
# self.logger.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.getShortName())
|
|
404
404
|
|
|
405
405
|
def readModeDeclarationGroupPrototype(self, element: ET.Element, prototype: ModeDeclarationGroupPrototype):
|
|
406
406
|
self.readIdentifiable(element, prototype)
|
|
@@ -429,7 +429,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
429
429
|
entity.addCanEnterExclusiveAreaRef(ref)
|
|
430
430
|
|
|
431
431
|
def readExecutableEntity(self, element: ET.Element, entity: ExecutableEntity):
|
|
432
|
-
self.logger.debug("
|
|
432
|
+
# self.logger.debug("Read ExecutableEntity %s" % entity.getShortName())
|
|
433
433
|
self.readIdentifiable(element, entity)
|
|
434
434
|
self.readCanEnterExclusiveAreaRefs(element, entity)
|
|
435
435
|
entity.setMinimumStartInterval(self.getChildElementOptionalFloatValue(element, "MINIMUM-START-INTERVAL")) \
|
|
@@ -448,7 +448,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
448
448
|
self.readBswEvent(element, event)
|
|
449
449
|
|
|
450
450
|
def readBswModeSwitchEvent(self, element: ET.Element, event: BswModeSwitchEvent):
|
|
451
|
-
self.logger.debug("Read BswModeSwitchEvent <%s>" % event.getShortName())
|
|
451
|
+
# self.logger.debug("Read BswModeSwitchEvent <%s>" % event.getShortName())
|
|
452
452
|
# Read the Inherit BswScheduleEvent
|
|
453
453
|
self.readBswScheduleEvent(element, event)
|
|
454
454
|
|
|
@@ -463,13 +463,13 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
463
463
|
self.logger.debug(" Period: <%f, %s>" % (event.getPeriod().getValue(), event.getPeriod().getText()))
|
|
464
464
|
|
|
465
465
|
def readBswDataReceivedEvent(self, element: ET.Element, event: BswDataReceivedEvent):
|
|
466
|
-
self.logger.debug("Read BswDataReceivedEvent <%s>" % event.getShortName())
|
|
466
|
+
# self.logger.debug("Read BswDataReceivedEvent <%s>" % event.getShortName())
|
|
467
467
|
# Read the Inherit BswScheduleEvent
|
|
468
468
|
self.readBswScheduleEvent(element, event)
|
|
469
469
|
event.setDataRef(self.getChildElementOptionalRefType(element, "DATA-REF"))
|
|
470
470
|
|
|
471
471
|
def readBswInternalTriggerOccurredEvent(self, element: ET.Element, event: BswInternalTriggerOccurredEvent):
|
|
472
|
-
self.logger.debug("Read BswInternalTriggerOccurredEvent <%s>" % event.getShortName())
|
|
472
|
+
# self.logger.debug("Read BswInternalTriggerOccurredEvent <%s>" % event.getShortName())
|
|
473
473
|
# Read the Inherit BswScheduleEvent
|
|
474
474
|
self.readBswScheduleEvent(element, event)
|
|
475
475
|
event.setEventSourceRef(self.getChildElementOptionalRefType(element, "EVENT-SOURCE-REF"))
|
|
@@ -566,9 +566,12 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
566
566
|
else:
|
|
567
567
|
self.raiseError("Unsupported assigned ports <%s>" % tag_name)
|
|
568
568
|
|
|
569
|
-
def
|
|
570
|
-
self.logger.debug("Read NvBlockNeeds <%s>" % needs.getShortName())
|
|
569
|
+
def readServiceNeeds(self, element: ET.Element, needs: ServiceNeeds):
|
|
571
570
|
self.readIdentifiable(element, needs)
|
|
571
|
+
|
|
572
|
+
def readNvBlockNeeds(self, element: ET.Element, needs: NvBlockNeeds):
|
|
573
|
+
# self.logger.debug("Read NvBlockNeeds <%s>" % needs.getShortName())
|
|
574
|
+
self.readServiceNeeds(element, needs)
|
|
572
575
|
needs.setCalcRamBlockCrc(self.getChildElementOptionalBooleanValue(element, "CALC-RAM-BLOCK-CRC")) \
|
|
573
576
|
.setCheckStaticBlockId(self.getChildElementOptionalBooleanValue(element, "CHECK-STATIC-BLOCK-ID")) \
|
|
574
577
|
.setNDataSets(self.getChildElementOptionalNumericalValue(element, "N-DATA-SETS")) \
|
|
@@ -590,21 +593,21 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
590
593
|
.setWritingPriority(self.getChildElementOptionalLiteral(element, "WRITING-PRIORITY"))
|
|
591
594
|
|
|
592
595
|
def readDiagnosticCapabilityElement(self, element: ET.Element, needs: DiagnosticCapabilityElement):
|
|
593
|
-
self.
|
|
596
|
+
self.readServiceNeeds(element, needs)
|
|
594
597
|
|
|
595
598
|
def readDiagnosticCommunicationManagerNeeds(self, element: ET.Element, needs: DiagnosticCommunicationManagerNeeds):
|
|
596
|
-
self.logger.debug("Read DiagnosticCommunicationManagerNeeds <%s>" % needs.getShortName())
|
|
599
|
+
# self.logger.debug("Read DiagnosticCommunicationManagerNeeds <%s>" % needs.getShortName())
|
|
597
600
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
598
601
|
needs.setServiceRequestCallbackType(self.getChildElementOptionalLiteral(element, "SERVICE-REQUEST-CALLBACK-TYPE"))
|
|
599
602
|
|
|
600
603
|
def readDiagnosticRoutineNeeds(self, element: ET.Element, needs: DiagnosticRoutineNeeds):
|
|
601
|
-
self.logger.debug("Read DiagnosticRoutineNeeds %s" % needs.getShortName())
|
|
604
|
+
# self.logger.debug("Read DiagnosticRoutineNeeds %s" % needs.getShortName())
|
|
602
605
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
603
606
|
needs.setDiagRoutineType(self.getChildElementOptionalLiteral(element, "DIAG-ROUTINE-TYPE")) \
|
|
604
607
|
.setRidNumber(self.getChildElementOptionalIntegerValue(element, "RID-NUMBER"))
|
|
605
608
|
|
|
606
609
|
def readDiagnosticValueNeeds(self, element: ET.Element, needs: DiagnosticValueNeeds):
|
|
607
|
-
self.logger.debug("Read DiagnosticValueNeeds %s" % needs.getShortName())
|
|
610
|
+
# self.logger.debug("Read DiagnosticValueNeeds %s" % needs.getShortName())
|
|
608
611
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
609
612
|
needs.setDataLength(self.getChildElementOptionalPositiveInteger(element, "DATA-LENGTH")) \
|
|
610
613
|
.setDiagnosticValueAccess(self.getChildElementOptionalLiteral(element, "DIAGNOSTIC-VALUE-ACCESS")) \
|
|
@@ -625,32 +628,36 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
625
628
|
self.notImplemented("Unsupported DiagEventDebounceAlgorithm <%s>" % tag_name)
|
|
626
629
|
|
|
627
630
|
def readDiagnosticEventNeeds(self, element: ET.Element, needs: DiagnosticEventNeeds):
|
|
628
|
-
self.logger.debug("Read DiagnosticEventNeeds <%s>" % needs.getShortName())
|
|
631
|
+
# self.logger.debug("Read DiagnosticEventNeeds <%s>" % needs.getShortName())
|
|
629
632
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
630
633
|
self.readDiagEventDebounceAlgorithm(element, needs)
|
|
631
634
|
needs.setDtcKind(self.getChildElementOptionalLiteral(element, "DTC-KIND")) \
|
|
632
635
|
.setUdsDtcNumber(self.getChildElementOptionalIntegerValue(element, "UDS-DTC-NUMBER"))
|
|
633
636
|
|
|
634
637
|
def readDiagnosticEventInfoNeeds(self, element: ET.Element, needs: DiagnosticEventInfoNeeds):
|
|
635
|
-
self.logger.debug("Read DiagnosticEventInfoNeeds <%s>" % needs.getShortName())
|
|
638
|
+
# self.logger.debug("Read DiagnosticEventInfoNeeds <%s>" % needs.getShortName())
|
|
636
639
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
637
640
|
needs.setDtcKind(self.getChildElementOptionalLiteral(element, "DTC-KIND"))
|
|
638
641
|
needs.setUdsDtcNumber(self.getChildElementOptionalPositiveInteger(element, "UDS-DTC-NUMBER"))
|
|
639
642
|
|
|
640
643
|
def readCryptoServiceNeeds(self, element: ET.Element, needs: CryptoServiceNeeds):
|
|
641
|
-
self.logger.debug("Read CryptoServiceNeeds <%s>" % needs.getShortName())
|
|
642
|
-
self.
|
|
644
|
+
# self.logger.debug("Read CryptoServiceNeeds <%s>" % needs.getShortName())
|
|
645
|
+
self.readServiceNeeds(element, needs)
|
|
643
646
|
needs.setMaximumKeyLength(self.getChildElementOptionalPositiveInteger(element, "MAXIMUM-KEY-LENGTH"))
|
|
644
647
|
|
|
645
648
|
def readEcuStateMgrUserNeeds(self, element: ET.Element, needs: EcuStateMgrUserNeeds):
|
|
646
|
-
self.logger.debug("Read EcuStateMgrUserNeeds %s" % needs.getShortName())
|
|
647
|
-
self.
|
|
649
|
+
# self.logger.debug("Read EcuStateMgrUserNeeds %s" % needs.getShortName())
|
|
650
|
+
self.readServiceNeeds(element, needs)
|
|
648
651
|
|
|
649
652
|
def readDtcStatusChangeNotificationNeeds(self, element: ET.Element, needs: DtcStatusChangeNotificationNeeds):
|
|
650
|
-
self.logger.debug("Read DtcStatusChangeNotificationNeeds %s" % needs.getShortName())
|
|
653
|
+
# self.logger.debug("Read DtcStatusChangeNotificationNeeds %s" % needs.getShortName())
|
|
651
654
|
self.readDiagnosticCapabilityElement(element, needs)
|
|
652
655
|
needs.setDtcFormatType(self.getChildElementOptionalLiteral(element, "DTC-FORMAT-TYPE"))
|
|
653
656
|
|
|
657
|
+
def readDltUserNeeds(self, element: ET.Element, needs: DltUserNeeds):
|
|
658
|
+
# self.logger.debug("Read DltUserNeeds %s" % needs.getShortName())
|
|
659
|
+
self.readServiceNeeds(element, needs)
|
|
660
|
+
|
|
654
661
|
def readSwcServiceDependencyServiceNeeds(self, element: ET.Element, parent: SwcServiceDependency):
|
|
655
662
|
for child_element in self.findall(element, "SERVICE-NEEDS/*"):
|
|
656
663
|
tag_name = self.getTagName(child_element)
|
|
@@ -681,13 +688,16 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
681
688
|
elif tag_name == "DTC-STATUS-CHANGE-NOTIFICATION-NEEDS":
|
|
682
689
|
needs = parent.createDtcStatusChangeNotificationNeeds(self.getShortName(child_element))
|
|
683
690
|
self.readDtcStatusChangeNotificationNeeds(child_element, needs)
|
|
691
|
+
elif tag_name == "DLT-USER-NEEDS":
|
|
692
|
+
needs = parent.createDltUserNeeds(self.getShortName(child_element))
|
|
693
|
+
self.readDltUserNeeds(child_element, needs)
|
|
684
694
|
else:
|
|
685
695
|
self.notImplemented("Unsupported service needs <%s>" % tag_name)
|
|
686
696
|
|
|
687
697
|
def readSwcServiceDependency(self, element: ET.Element, parent: SwcInternalBehavior):
|
|
688
698
|
short_name = self.getShortName(element)
|
|
689
699
|
dependency = parent.createSwcServiceDependency(short_name)
|
|
690
|
-
self.logger.debug("
|
|
700
|
+
# self.logger.debug("Read SwcServiceDependency %s" % short_name)
|
|
691
701
|
self.readServiceDependency(element, dependency)
|
|
692
702
|
self.readSwcServiceDependencyAssignedData(element, dependency)
|
|
693
703
|
self.readSwcServiceDependencyAssignedPorts(element, dependency)
|
|
@@ -831,15 +841,15 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
831
841
|
self.readBswModuleEntityIssuedTriggerRefs(element, entity)
|
|
832
842
|
|
|
833
843
|
def readBswCalledEntity(self, element: ET.Element, entity: BswCalledEntity):
|
|
834
|
-
self.logger.debug("
|
|
844
|
+
# self.logger.debug("Read BswCalledEntity %s" % entity.getShortName())
|
|
835
845
|
self.readBswModuleEntity(element, entity)
|
|
836
846
|
|
|
837
847
|
def readBswSchedulableEntity(self, element: ET.Element, entity: BswSchedulableEntity):
|
|
838
|
-
self.logger.debug("
|
|
848
|
+
# self.logger.debug("Read BswSchedulableEntity %s" % entity.getShortName())
|
|
839
849
|
self.readBswModuleEntity(element, entity)
|
|
840
850
|
|
|
841
851
|
def readBswInterruptEntity(self, element: ET.Element, entity: BswInterruptEntity):
|
|
842
|
-
self.logger.debug("
|
|
852
|
+
# self.logger.debug("Read BswSchedulableEntity %s" % entity.getShortName())
|
|
843
853
|
self.readBswModuleEntity(element, entity)
|
|
844
854
|
entity.setInterruptCategory(self.getChildElementOptionalLiteral(element, "INTERRUPT-CATEGORY")) \
|
|
845
855
|
.setInterruptSource(self.getChildElementOptionalLiteral(element, "INTERRUPT-SOURCE"))
|
|
@@ -1056,8 +1066,6 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1056
1066
|
.setExecutionContext(self.getChildElementOptionalLiteral(element, "EXECUTION-CONTEXT")) \
|
|
1057
1067
|
.setSwServiceImplPolicy(self.getChildElementOptionalLiteral(element, "SW-SERVICE-IMPL-POLICY"))
|
|
1058
1068
|
|
|
1059
|
-
self.logger.debug("read BswModuleEntry %s" % entry.getShortName())
|
|
1060
|
-
|
|
1061
1069
|
def readEngineeringObject(self, element: ET.Element, engineering_obj: EngineeringObject):
|
|
1062
1070
|
self.readARObjectAttributes(element, engineering_obj)
|
|
1063
1071
|
engineering_obj.setShortLabel(self.getChildElementOptionalLiteral(element, "SHORT-LABEL")) \
|
|
@@ -1066,7 +1074,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1066
1074
|
def getAutosarEngineeringObject(self, element: ET.Element) -> AutosarEngineeringObject:
|
|
1067
1075
|
obj = AutosarEngineeringObject()
|
|
1068
1076
|
self.readEngineeringObject(element, obj)
|
|
1069
|
-
self.logger.debug("
|
|
1077
|
+
# self.logger.debug("Get AutosarEngineeringObject %s", obj.short_label)
|
|
1070
1078
|
return obj
|
|
1071
1079
|
|
|
1072
1080
|
def readArtifactDescriptor(self, element: ET.Element, code_desc: Code):
|
|
@@ -1080,7 +1088,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1080
1088
|
def readCodeDescriptor(self, element: ET.Element, impl: Implementation):
|
|
1081
1089
|
for child_element in self.findall(element, "CODE-DESCRIPTORS/CODE"):
|
|
1082
1090
|
short_name = self.getShortName(child_element)
|
|
1083
|
-
self.logger.debug("
|
|
1091
|
+
# self.logger.debug("Read CodeDescriptor %s" % short_name)
|
|
1084
1092
|
code_desc = impl.createCodeDescriptor(short_name)
|
|
1085
1093
|
self.readIdentifiable(child_element, code_desc)
|
|
1086
1094
|
self.readArtifactDescriptor(child_element, code_desc)
|
|
@@ -1101,7 +1109,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1101
1109
|
memory_section.setSize(self.getChildElementOptionalNumericalValue(child_element, "SIZE")) \
|
|
1102
1110
|
.setSwAddrMethodRef(self.getChildElementOptionalRefType(child_element, "SW-ADDRMETHOD-REF")) \
|
|
1103
1111
|
.setSymbol(self.getChildElementOptionalLiteral(child_element, "SYMBOL"))
|
|
1104
|
-
self.logger.debug("read MemorySections %s" % memory_section.getShortName())
|
|
1112
|
+
# self.logger.debug("read MemorySections %s" % memory_section.getShortName())
|
|
1105
1113
|
|
|
1106
1114
|
def readStackUsage(self, element: ET.Element, usage: StackUsage):
|
|
1107
1115
|
self.logger.debug("read StackUsage %s" % usage.getShortName())
|
|
@@ -1226,16 +1234,16 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1226
1234
|
parent.addModeIRef(mode_iref)
|
|
1227
1235
|
|
|
1228
1236
|
def readSynchronousServerCallPoint(self, element: ET.Element, parent: RunnableEntity):
|
|
1237
|
+
# self.logger.debug("readSynchronousServerCallPoint %s" % short_name)
|
|
1229
1238
|
short_name = self.getShortName(element)
|
|
1230
|
-
self.logger.debug("readSynchronousServerCallPoint %s" % short_name)
|
|
1231
1239
|
server_call_point = parent.createSynchronousServerCallPoint(short_name)
|
|
1232
1240
|
self.readIdentifiable(element, server_call_point)
|
|
1233
1241
|
server_call_point.setTimeout(self.getChildElementOptionalFloatValue(element, "TIMEOUT"))
|
|
1234
1242
|
self.readROperationIRef(element, "OPERATION-IREF", server_call_point)
|
|
1235
1243
|
|
|
1236
1244
|
def readAsynchronousServerCallPoint(self, element: ET.Element, parent: RunnableEntity):
|
|
1245
|
+
# self.logger.debug("readAsynchronousServerCallPoint %s" % short_name)
|
|
1237
1246
|
short_name = self.getShortName(element)
|
|
1238
|
-
self.logger.debug("readAsynchronousServerCallPoint %s" % short_name)
|
|
1239
1247
|
server_call_point = parent.createAsynchronousServerCallPoint(short_name)
|
|
1240
1248
|
self.readIdentifiable(element, server_call_point)
|
|
1241
1249
|
server_call_point.setTimeout(self.getChildElementOptionalFloatValue(element, "TIMEOUT"))
|
|
@@ -1388,7 +1396,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1388
1396
|
parent.setOperationIRef(operation_iref)
|
|
1389
1397
|
|
|
1390
1398
|
def readOperationInvokedEvent(self, element: ET.Element, event: OperationInvokedEvent):
|
|
1391
|
-
self.logger.debug("Read OperationInvokedEvent <%s>" % event.getShortName())
|
|
1399
|
+
# self.logger.debug("Read OperationInvokedEvent <%s>" % event.getShortName())
|
|
1392
1400
|
self.readPOperationIRef(element, "OPERATION-IREF", event)
|
|
1393
1401
|
self.readRTEEvent(element, event)
|
|
1394
1402
|
|
|
@@ -1446,43 +1454,43 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1446
1454
|
behavior.addPortAPIOption(option)
|
|
1447
1455
|
|
|
1448
1456
|
def readTimingEvent(self, element: ET.Element, event: TimingEvent):
|
|
1449
|
-
self.logger.debug("Read TimingEvent <%s>" % event.getShortName())
|
|
1457
|
+
# self.logger.debug("Read TimingEvent <%s>" % event.getShortName())
|
|
1450
1458
|
self.readRTEEvent(element, event)
|
|
1451
1459
|
event.setOffset(self.getChildElementOptionalTimeValue(element, "OFFSET")) \
|
|
1452
1460
|
.setPeriod(self.getChildElementOptionalTimeValue(element, "PERIOD"))
|
|
1453
1461
|
|
|
1454
1462
|
def readDataReceivedEvent(self, element: ET.Element, event: DataReceivedEvent):
|
|
1455
|
-
self.logger.debug("Read DataReceivedEvent <%s>" % event.getShortName())
|
|
1463
|
+
# self.logger.debug("Read DataReceivedEvent <%s>" % event.getShortName())
|
|
1456
1464
|
self.readRTEEvent(element, event)
|
|
1457
1465
|
self.readRVariableInAtomicSwcInstanceRef(element, event)
|
|
1458
1466
|
|
|
1459
1467
|
def readSwcModeSwitchEvent(self, element: ET.Element, event: SwcModeSwitchEvent):
|
|
1460
|
-
self.logger.debug("Read SwcModeSwitchEvent <%s>" % event.getShortName())
|
|
1468
|
+
# self.logger.debug("Read SwcModeSwitchEvent <%s>" % event.getShortName())
|
|
1461
1469
|
self.readRTEEvent(element, event)
|
|
1462
1470
|
event.setActivation(self.getChildElementOptionalLiteral(element, "ACTIVATION"))
|
|
1463
1471
|
self.readRModeInAtomicSwcInstanceRef(element, event)
|
|
1464
1472
|
|
|
1465
1473
|
def readInternalTriggerOccurredEvent(self, element: ET.Element, event: InternalTriggerOccurredEvent):
|
|
1466
|
-
self.logger.debug("Read InternalTriggerOccurredEvent <%s>" % event.getShortName())
|
|
1474
|
+
# self.logger.debug("Read InternalTriggerOccurredEvent <%s>" % event.getShortName())
|
|
1467
1475
|
self.readRTEEvent(element, event)
|
|
1468
1476
|
event.setEventSourceRef(self.getChildElementOptionalRefType(element, "EVENT-SOURCE-REF"))
|
|
1469
1477
|
|
|
1470
1478
|
def readInitEvent(self, element, event: InitEvent):
|
|
1471
|
-
self.logger.debug("Read InitEvent <%s>" % event.getShortName())
|
|
1479
|
+
# self.logger.debug("Read InitEvent <%s>" % event.getShortName())
|
|
1472
1480
|
self.readRTEEvent(element, event)
|
|
1473
1481
|
|
|
1474
1482
|
def readAsynchronousServerCallReturnsEvent(self, element, event: AsynchronousServerCallReturnsEvent):
|
|
1475
|
-
self.logger.debug("Read AsynchronousServerCallReturnsEvent <%s>" % event.getShortName())
|
|
1483
|
+
# self.logger.debug("Read AsynchronousServerCallReturnsEvent <%s>" % event.getShortName())
|
|
1476
1484
|
self.readRTEEvent(element, event)
|
|
1477
1485
|
event.setActivationReasonRepresentationRef(self.getChildElementOptionalRefType(element, "EVENT-SOURCE-REF"))
|
|
1478
1486
|
|
|
1479
1487
|
def readModeSwitchedAckEvent(self, element, event: ModeSwitchedAckEvent):
|
|
1480
|
-
self.logger.debug("Read ModeSwitchedAckEvent <%s>" % event.getShortName())
|
|
1488
|
+
# self.logger.debug("Read ModeSwitchedAckEvent <%s>" % event.getShortName())
|
|
1481
1489
|
self.readRTEEvent(element, event)
|
|
1482
1490
|
event.setEventSourceRef(self.getChildElementOptionalRefType(element, "EVENT-SOURCE-REF"))
|
|
1483
1491
|
|
|
1484
1492
|
def readBackgroundEvent(self, element, event: BackgroundEvent):
|
|
1485
|
-
self.logger.debug("Read BackgroundEvent <%s>" % event.getShortName())
|
|
1493
|
+
# self.logger.debug("Read BackgroundEvent <%s>" % event.getShortName())
|
|
1486
1494
|
self.readRTEEvent(element, event)
|
|
1487
1495
|
|
|
1488
1496
|
def readSwcInternalBehaviorEvents(self, element: ET.Element, parent: SwcInternalBehavior):
|
|
@@ -1749,7 +1757,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1749
1757
|
self.readAutosarDataType(element, data_type)
|
|
1750
1758
|
|
|
1751
1759
|
def readApplicationRecordElement(self, element: ET.Element, record_element: ApplicationRecordElement):
|
|
1752
|
-
self.logger.debug("
|
|
1760
|
+
# self.logger.debug("Read ApplicationRecordElement %s" % record_element.getShortName())
|
|
1753
1761
|
self.readApplicationCompositeElementDataPrototype(element, record_element)
|
|
1754
1762
|
|
|
1755
1763
|
def readApplicationRecordDataTypeElements(self, element: ET.Element, parent: ApplicationRecordDataType):
|
|
@@ -1808,7 +1816,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1808
1816
|
return iref
|
|
1809
1817
|
|
|
1810
1818
|
def getCompositeNetworkRepresentation(self, element: ET.Element) -> CompositeNetworkRepresentation:
|
|
1811
|
-
self.logger.debug("getCompositeNetworkRepresentation")
|
|
1819
|
+
# self.logger.debug("getCompositeNetworkRepresentation")
|
|
1812
1820
|
representation = CompositeNetworkRepresentation()
|
|
1813
1821
|
representation.setLeafElementIRef(self.getApplicationCompositeElementInPortInterfaceInstanceRef(element, "LEAF-ELEMENT-IREF")) \
|
|
1814
1822
|
.setNetworkRepresentation(self.getSwDataDefProps(element, "NETWORK-REPRESENTATION"))
|
|
@@ -1839,7 +1847,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1839
1847
|
value_list = None
|
|
1840
1848
|
child_element = self.find(element, key)
|
|
1841
1849
|
if child_element is not None:
|
|
1842
|
-
self.logger.debug("
|
|
1850
|
+
# self.logger.debug("Get ValueList %s" % key)
|
|
1843
1851
|
value_list = ValueList()
|
|
1844
1852
|
self.readARObjectAttributes(child_element, value_list)
|
|
1845
1853
|
value_list.setV(self.getChildElementOptionalFloatValue(child_element, "V"))
|
|
@@ -1849,7 +1857,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1849
1857
|
cont = None
|
|
1850
1858
|
child_element = self.find(element, "SW-VALUE-CONT")
|
|
1851
1859
|
if child_element is not None:
|
|
1852
|
-
self.logger.debug("
|
|
1860
|
+
# self.logger.debug("Get SwValueCont")
|
|
1853
1861
|
cont = SwValueCont()
|
|
1854
1862
|
self.readARObjectAttributes(child_element, cont)
|
|
1855
1863
|
cont.setUnitRef(self.getChildElementOptionalRefType(child_element, "UNIT-REF")) \
|
|
@@ -1931,7 +1939,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1931
1939
|
self.readProvidedComSpec(element, prototype)
|
|
1932
1940
|
|
|
1933
1941
|
def readPPortPrototype(self, element: ET.Element, prototype: PPortPrototype):
|
|
1934
|
-
self.logger.debug("Read PPortPrototype %s" % prototype.getShortName())
|
|
1942
|
+
# self.logger.debug("Read PPortPrototype %s" % prototype.getShortName())
|
|
1935
1943
|
self.readIdentifiable(element, prototype)
|
|
1936
1944
|
self.readAbstractRequiredPortPrototype(element, prototype)
|
|
1937
1945
|
prototype.setProvidedInterfaceTRef(self.getChildElementOptionalRefType(element, "PROVIDED-INTERFACE-TREF"))
|
|
@@ -1940,13 +1948,13 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
1940
1948
|
self.readRequiredComSpec(element, prototype)
|
|
1941
1949
|
|
|
1942
1950
|
def readRPortPrototype(self, element: ET.Element, prototype: RPortPrototype):
|
|
1943
|
-
self.logger.debug("Read RPortPrototype %s" % prototype.getShortName())
|
|
1951
|
+
# self.logger.debug("Read RPortPrototype %s" % prototype.getShortName())
|
|
1944
1952
|
self.readIdentifiable(element, prototype)
|
|
1945
1953
|
self.readAbstractProvidedPortPrototype(element, prototype)
|
|
1946
1954
|
prototype.setRequiredInterfaceTRef(self.getChildElementOptionalRefType(element, "REQUIRED-INTERFACE-TREF"))
|
|
1947
1955
|
|
|
1948
1956
|
def readPRPortPrototype(self, element: ET.Element, prototype: PRPortPrototype):
|
|
1949
|
-
self.logger.debug("Read PRPortPrototype %s" % prototype.getShortName())
|
|
1957
|
+
# self.logger.debug("Read PRPortPrototype %s" % prototype.getShortName())
|
|
1950
1958
|
self.readIdentifiable(element, prototype)
|
|
1951
1959
|
self.readAbstractRequiredPortPrototype(element, prototype)
|
|
1952
1960
|
self.readAbstractProvidedPortPrototype(element, prototype)
|
|
@@ -2093,6 +2101,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2093
2101
|
p_port_in_composition_instance_ref.setContextComponentRef(self.getChildElementOptionalRefType(element, "CONTEXT-COMPONENT-REF")) \
|
|
2094
2102
|
.setTargetPPortRef(self.getChildElementOptionalRefType(element, "TARGET-P-PORT-REF"))
|
|
2095
2103
|
|
|
2104
|
+
'''
|
|
2096
2105
|
self.logger.debug("PPortInCompositionInstanceRef")
|
|
2097
2106
|
self.logger.debug(" CONTEXT-COMPONENT-REF DEST: %s, %s"
|
|
2098
2107
|
% (p_port_in_composition_instance_ref.getContextComponentRef().getDest(),
|
|
@@ -2100,11 +2109,13 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2100
2109
|
self.logger.debug(" TARGET-P-PORT-REF DEST: %s, %s"
|
|
2101
2110
|
% (p_port_in_composition_instance_ref.getTargetPPortRef().getDest(),
|
|
2102
2111
|
p_port_in_composition_instance_ref.getTargetPPortRef().getValue()))
|
|
2112
|
+
'''
|
|
2103
2113
|
|
|
2104
2114
|
def readRPortInCompositionInstanceRef(self, element, r_port_in_composition_instance_ref: RPortInCompositionInstanceRef):
|
|
2105
2115
|
r_port_in_composition_instance_ref.setContextComponentRef(self.getChildElementOptionalRefType(element, "CONTEXT-COMPONENT-REF")) \
|
|
2106
2116
|
.setTargetRPortRef(self.getChildElementOptionalRefType(element, "TARGET-R-PORT-REF"))
|
|
2107
2117
|
|
|
2118
|
+
'''
|
|
2108
2119
|
self.logger.debug("RPortInCompositionInstanceRef")
|
|
2109
2120
|
self.logger.debug(" CONTEXT-COMPONENT-REF DEST: %s, %s"
|
|
2110
2121
|
% (r_port_in_composition_instance_ref.getContextComponentRef().getDest(),
|
|
@@ -2112,6 +2123,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2112
2123
|
self.logger.debug(" TARGET-P-PORT-REF DEST: %s, %s"
|
|
2113
2124
|
% (r_port_in_composition_instance_ref.getTargetRPortRef().getDest(),
|
|
2114
2125
|
r_port_in_composition_instance_ref.getTargetRPortRef().getValue()))
|
|
2126
|
+
'''
|
|
2115
2127
|
|
|
2116
2128
|
def readAssemblySwConnectorProviderIRef(self, element: ET.Element, parent: AssemblySwConnector):
|
|
2117
2129
|
child_element = self.find(element, "PROVIDER-IREF")
|
|
@@ -2134,7 +2146,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2134
2146
|
connector.setMappingRef(self.getChildElementOptionalRefType(element, "MAPPING-REF"))
|
|
2135
2147
|
|
|
2136
2148
|
def readAssemblySwConnector(self, element: ET.Element, connector: AssemblySwConnector):
|
|
2137
|
-
self.logger.debug("Read AssemblySwConnectors %s" % connector.getShortName())
|
|
2149
|
+
# self.logger.debug("Read AssemblySwConnectors %s" % connector.getShortName())
|
|
2138
2150
|
self.readSwConnector(element, connector)
|
|
2139
2151
|
self.readAssemblySwConnectorProviderIRef(element, connector)
|
|
2140
2152
|
self.readAssemblySwConnectorRequesterIRef(element, connector)
|
|
@@ -2171,7 +2183,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2171
2183
|
self.raiseError("Unsupported child element of INNER-PORT-IREF")
|
|
2172
2184
|
|
|
2173
2185
|
def readDelegationSwConnector(self, element, connector: DelegationSwConnector):
|
|
2174
|
-
self.logger.debug("Read DelegationSwConnectors %s" % connector.getShortName())
|
|
2186
|
+
# self.logger.debug("Read DelegationSwConnectors %s" % connector.getShortName())
|
|
2175
2187
|
self.readSwConnector(element, connector)
|
|
2176
2188
|
self.readDelegationSwConnectorInnerPortIRef(element, connector)
|
|
2177
2189
|
|
|
@@ -2179,7 +2191,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2179
2191
|
self.raiseError("Invalid PortPrototype of DELEGATION-SW-CONNECTOR")
|
|
2180
2192
|
|
|
2181
2193
|
connector.setOuterPortRef(self.getChildElementOptionalRefType(element, "OUTER-PORT-REF"))
|
|
2182
|
-
self.logger.debug("OUTER-PORT-REF DEST: %s, %s" % (connector.getOuterPortRef().getDest(), connector.getOuterPortRef().getValue()))
|
|
2194
|
+
# self.logger.debug("OUTER-PORT-REF DEST: %s, %s" % (connector.getOuterPortRef().getDest(), connector.getOuterPortRef().getValue()))
|
|
2183
2195
|
|
|
2184
2196
|
def readSwComponentPrototype(self, element: ET.Element, prototype: SwComponentPrototype):
|
|
2185
2197
|
self.logger.debug("Read SwComponentPrototypes <%s>" % prototype.getShortName())
|
|
@@ -2197,7 +2209,6 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2197
2209
|
|
|
2198
2210
|
def readCompositionSwComponentTypeDataTypeMappingSet(self, element: ET.Element, parent: CompositionSwComponentType):
|
|
2199
2211
|
child_element = self.find(element, "DATA-TYPE-MAPPING-REFS")
|
|
2200
|
-
self.logger.debug("readDataTypeMappingSet")
|
|
2201
2212
|
if child_element is not None:
|
|
2202
2213
|
for ref in self.getChildElementRefTypeList(child_element, "DATA-TYPE-MAPPING-REF"):
|
|
2203
2214
|
parent.addDataTypeMapping(ref)
|
|
@@ -2331,7 +2342,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2331
2342
|
self.readParameterInterfaceParameters(element, interface)
|
|
2332
2343
|
|
|
2333
2344
|
def readClientServerInterface(self, element: ET.Element, cs_interface: ClientServerInterface):
|
|
2334
|
-
self.logger.debug("Read
|
|
2345
|
+
self.logger.debug("Read ClientServerInterface <%s>" % cs_interface.getShortName())
|
|
2335
2346
|
self.readPortInterface(element, cs_interface)
|
|
2336
2347
|
self.readClientServerInterfaceOperations(element, cs_interface)
|
|
2337
2348
|
self.readPossibleErrors(element, cs_interface)
|
|
@@ -2366,7 +2377,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2366
2377
|
def readCompuConst(self, element: ET.Element, parent: CompuScale):
|
|
2367
2378
|
child_element = self.find(element, "COMPU-CONST/VT")
|
|
2368
2379
|
if (child_element is not None):
|
|
2369
|
-
self.logger.debug("
|
|
2380
|
+
# self.logger.debug("Read CompuConst VT: %s" % child_element.text)
|
|
2370
2381
|
contents = CompuScaleConstantContents()
|
|
2371
2382
|
contents.compuConst = CompuConst()
|
|
2372
2383
|
contents.compuConst.compuConstContentType = CompuConstTextContent()
|
|
@@ -2376,13 +2387,13 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2376
2387
|
|
|
2377
2388
|
def readCompuNominatorDenominator(self, element: ET.Element, key: str, parent: CompuNominatorDenominator):
|
|
2378
2389
|
for child_element in self.findall(element, "%s/V" % key):
|
|
2379
|
-
self.logger.debug("
|
|
2390
|
+
# self.logger.debug("Read CompuNominatorDenominator - %s: %s" % (key, child_element.text))
|
|
2380
2391
|
parent.add_v(child_element.text)
|
|
2381
2392
|
|
|
2382
2393
|
def readCompuRationCoeffs(self, element: ET.Element, parent: CompuScale):
|
|
2383
2394
|
child_element = self.find(element, "COMPU-RATIONAL-COEFFS")
|
|
2384
2395
|
if (child_element is not None):
|
|
2385
|
-
self.logger.debug("
|
|
2396
|
+
# self.logger.debug("Read CompuRationCoeffs")
|
|
2386
2397
|
contents = CompuScaleRationalFormula()
|
|
2387
2398
|
contents.compuRationalCoeffs = CompuRationalCoeffs()
|
|
2388
2399
|
contents.compuRationalCoeffs.compuDenominator = CompuNominatorDenominator()
|
|
@@ -2426,7 +2437,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2426
2437
|
return compu
|
|
2427
2438
|
|
|
2428
2439
|
def readCompuMethod(self, element: ET.Element, compu_method: CompuMethod):
|
|
2429
|
-
self.logger.debug("Read
|
|
2440
|
+
self.logger.debug("Read CompuMethod <%s>" % compu_method.getShortName())
|
|
2430
2441
|
self.readIdentifiable(element, compu_method)
|
|
2431
2442
|
compu_method.setUnitRef(self.getChildElementOptionalRefType(element, "UNIT-REF")) \
|
|
2432
2443
|
.setCompuInternalToPhys(self.getCompu(element, "COMPU-INTERNAL-TO-PHYS")) \
|
|
@@ -2440,7 +2451,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2440
2451
|
parent.addRunnableMapping(mapping)
|
|
2441
2452
|
|
|
2442
2453
|
def readSwcBswMapping(self, element: ET.Element, mapping: SwcBswMapping):
|
|
2443
|
-
self.logger.debug("
|
|
2454
|
+
self.logger.debug("Read SwcBswMapping <%s>" % mapping.getShortName())
|
|
2444
2455
|
self.readIdentifiable(element, mapping)
|
|
2445
2456
|
mapping.setBswBehaviorRef(self.getChildElementOptionalRefType(element, "BSW-BEHAVIOR-REF"))
|
|
2446
2457
|
self.readSwcBswMappingSwcBswRunnableMappings(element, mapping)
|
|
@@ -2467,7 +2478,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2467
2478
|
return value_spec
|
|
2468
2479
|
|
|
2469
2480
|
def getTextValueSpecification(self, element: ET.Element) -> TextValueSpecification:
|
|
2470
|
-
self.logger.debug("
|
|
2481
|
+
# self.logger.debug("Get TextValueSpecification")
|
|
2471
2482
|
value_spec = TextValueSpecification()
|
|
2472
2483
|
self.readValueSpecification(element, value_spec)
|
|
2473
2484
|
value_spec.setShortLabel(self.getChildElementOptionalLiteral(element, "SHORT-LABEL")) \
|
|
@@ -2475,7 +2486,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2475
2486
|
return value_spec
|
|
2476
2487
|
|
|
2477
2488
|
def getArrayValueSpecification(self, element: ET.Element) -> ArrayValueSpecification:
|
|
2478
|
-
self.logger.debug("
|
|
2489
|
+
# self.logger.debug("Get ArrayValueSpecification")
|
|
2479
2490
|
value_spec = ArrayValueSpecification()
|
|
2480
2491
|
self.readValueSpecification(element, value_spec)
|
|
2481
2492
|
child_elements = element.findall("./xmlns:ELEMENTS/*", self.nsmap)
|
|
@@ -2484,7 +2495,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2484
2495
|
return value_spec
|
|
2485
2496
|
|
|
2486
2497
|
def getConstantReference(self, element: ET.Element) -> ConstantReference:
|
|
2487
|
-
self.logger.debug("getConstantReference")
|
|
2498
|
+
# self.logger.debug("getConstantReference")
|
|
2488
2499
|
value_spec = ConstantReference()
|
|
2489
2500
|
self.readValueSpecification(element, value_spec)
|
|
2490
2501
|
value_spec.setConstantRef(self.getChildElementOptionalRefType(element, "CONSTANT-REF"))
|
|
@@ -2518,7 +2529,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2518
2529
|
return value_spec
|
|
2519
2530
|
|
|
2520
2531
|
def readConstantSpecification(self, element: ET.Element, spec: ConstantSpecification):
|
|
2521
|
-
self.logger.debug("
|
|
2532
|
+
self.logger.debug("Read ConstantSpecification <%s>" % spec.getShortName())
|
|
2522
2533
|
self.readIdentifiable(element, spec)
|
|
2523
2534
|
for child_element in self.findall(element, "VALUE-SPEC/*"):
|
|
2524
2535
|
spec.setValueSpec(self.getValueSpecification(child_element, self.getTagName(child_element)))
|
|
@@ -2533,7 +2544,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2533
2544
|
parent.internalConstrs = constrs
|
|
2534
2545
|
|
|
2535
2546
|
def readPhysConstrs(self, element: ET.Element, parent: DataConstrRule):
|
|
2536
|
-
child_element =
|
|
2547
|
+
child_element = self.find(element, "PHYS-CONSTRS")
|
|
2537
2548
|
if child_element is not None:
|
|
2538
2549
|
constrs = PhysConstrs()
|
|
2539
2550
|
self.readARObjectAttributes(child_element, constrs)
|
|
@@ -2543,8 +2554,8 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2543
2554
|
parent.physConstrs = constrs
|
|
2544
2555
|
|
|
2545
2556
|
def readDataConstrRule(self, element: ET.Element, parent: DataConstr):
|
|
2546
|
-
for child_element in
|
|
2547
|
-
self.logger.debug("
|
|
2557
|
+
for child_element in self.findall(element, "DATA-CONSTR-RULES/DATA-CONSTR-RULE"):
|
|
2558
|
+
# self.logger.debug("Read DataConstrRule")
|
|
2548
2559
|
rule = DataConstrRule()
|
|
2549
2560
|
self.readARObjectAttributes(child_element, rule)
|
|
2550
2561
|
rule.constrLevel = self.getChildElementOptionalNumericalValue(child_element, "CONSTR-LEVEL")
|
|
@@ -2553,7 +2564,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
2553
2564
|
parent.addDataConstrRule(rule)
|
|
2554
2565
|
|
|
2555
2566
|
def readDataConstr(self, element: ET.Element, constr: DataConstr):
|
|
2556
|
-
self.logger.debug("Read DataConstr <%s>" % constr.getShortName())
|
|
2567
|
+
# self.logger.debug("Read DataConstr <%s>" % constr.getShortName())
|
|
2557
2568
|
self.readIdentifiable(element, constr)
|
|
2558
2569
|
self.readDataConstrRule(element, constr)
|
|
2559
2570
|
|
|
@@ -4810,7 +4821,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
4810
4821
|
timing = None
|
|
4811
4822
|
child_element = self.find(element, key)
|
|
4812
4823
|
if child_element is not None:
|
|
4813
|
-
self.logger.debug("Get TransmissionModeTiming of <%s>" % key)
|
|
4824
|
+
# self.logger.debug("Get TransmissionModeTiming of <%s>" % key)
|
|
4814
4825
|
timing = TransmissionModeTiming()
|
|
4815
4826
|
timing.setCyclicTiming(self.getCyclicTiming(child_element, "CYCLIC-TIMING")) \
|
|
4816
4827
|
.setEventControlledTiming(self.getEventControlledTiming(child_element, "EVENT-CONTROLLED-TIMING"))
|
|
@@ -4919,7 +4930,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
4919
4930
|
self.notImplemented("Unsupported Data Mapping %s" % tag_name)
|
|
4920
4931
|
|
|
4921
4932
|
def readSwcToEcuMapping(self, element: ET.Element, mapping: SwcToEcuMapping):
|
|
4922
|
-
self.logger.debug("SwcToEcuMapping %s" % mapping.getShortName())
|
|
4933
|
+
# self.logger.debug("SwcToEcuMapping %s" % mapping.getShortName())
|
|
4923
4934
|
self.readIdentifiable(element, mapping)
|
|
4924
4935
|
for child_element in self.findall(element, "COMPONENT-IREFS/COMPONENT-IREF"):
|
|
4925
4936
|
mapping.addComponentIRef(self.getComponentInSystemInstanceRef(child_element))
|
|
@@ -4964,7 +4975,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
4964
4975
|
self.notImplemented("Unsupported SwImplMapping <%s>" % tag_name)
|
|
4965
4976
|
|
|
4966
4977
|
def readSystemMapping(self, element: ET.Element, mapping: SystemMapping):
|
|
4967
|
-
self.logger.debug("SystemMapping
|
|
4978
|
+
# self.logger.debug("Read SystemMapping <%s>" % mapping.getShortName())
|
|
4968
4979
|
self.readIdentifiable(element, mapping)
|
|
4969
4980
|
self.readSystemMappingDataMappings(element, mapping)
|
|
4970
4981
|
self.readSystemMappingEcuResourceMappings(element, mapping)
|
|
@@ -5368,7 +5379,7 @@ class ARXMLParser(AbstractARXMLParser):
|
|
|
5368
5379
|
parent.addReferenceBase(base)
|
|
5369
5380
|
|
|
5370
5381
|
def readARPackage(self, element: ET.Element, ar_package: ARPackage):
|
|
5371
|
-
self.logger.debug("Read ARPackages
|
|
5382
|
+
self.logger.debug("Read ARPackages <%s>" % ar_package.getFullName())
|
|
5372
5383
|
|
|
5373
5384
|
self.readIdentifiable(element, ar_package)
|
|
5374
5385
|
self.readARPackages(element, ar_package)
|