armodel 1.7.4__py3-none-any.whl → 1.7.6__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/file_list_cli.py +70 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py +2 -2
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py +4 -0
- armodel/models/M2/AUTOSARTemplates/DiagnosticExtract/DiagnosticContribution.py +47 -0
- armodel/models/M2/AUTOSARTemplates/DiagnosticExtract/__init__.py +0 -0
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py +73 -3
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py +22 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/DiagnosticConnection.py +58 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanTopology.py +165 -4
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetCommunication.py +16 -1
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetTopology.py +514 -17
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/NetworkEndpoint.py +104 -1
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/ServiceInstances.py +783 -13
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinCommunication.py +114 -6
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinTopology.py +92 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Multiplatform.py +76 -10
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreCommunication.py +151 -6
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py +143 -36
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/EcuInstance.py +13 -0
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/NetworkManagement.py +135 -13
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/TransportProtocols.py +79 -2
- armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py +4 -2
- armodel/models/M2/MSR/DataDictionary/RecordLayout.py +1 -1
- armodel/models/__init__.py +3 -0
- armodel/parser/abstract_arxml_parser.py +7 -5
- armodel/parser/arxml_parser.py +927 -438
- armodel/writer/arxml_writer.py +799 -178
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/METADATA +52 -1
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/RECORD +33 -28
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/entry_points.txt +1 -0
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/LICENSE +0 -0
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/WHEEL +0 -0
- {armodel-1.7.4.dist-info → armodel-1.7.6.dist-info}/top_level.txt +0 -0
|
@@ -32,14 +32,14 @@ class AbstractARXMLParser:
|
|
|
32
32
|
tag = tag.tag
|
|
33
33
|
if isinstance(tag, str):
|
|
34
34
|
return tag.replace("{%s}" % self.nsmap["xmlns"], "")
|
|
35
|
-
|
|
35
|
+
self.raiseError("Invalid Tag type <%s>" % type(tag))
|
|
36
36
|
|
|
37
37
|
def _processOptions(self, options):
|
|
38
38
|
if options:
|
|
39
39
|
if 'warning' in options:
|
|
40
40
|
self.options['warning'] = options['warning']
|
|
41
41
|
|
|
42
|
-
def
|
|
42
|
+
def raiseError(self, error_msg):
|
|
43
43
|
if (self.options['warning'] == True):
|
|
44
44
|
self.logger.error(Fore.RED + error_msg + Fore.WHITE)
|
|
45
45
|
else:
|
|
@@ -51,7 +51,7 @@ class AbstractARXMLParser:
|
|
|
51
51
|
else:
|
|
52
52
|
raise NotImplementedError(error_msg)
|
|
53
53
|
|
|
54
|
-
def
|
|
54
|
+
def raiseWarning(self, error_msg):
|
|
55
55
|
self.logger.warning(error_msg)
|
|
56
56
|
|
|
57
57
|
def getPureTagName(self, tag):
|
|
@@ -81,7 +81,7 @@ class AbstractARXMLParser:
|
|
|
81
81
|
self.readARObjectAttributes(child_element, literal)
|
|
82
82
|
literal._value = child_element.text
|
|
83
83
|
return literal
|
|
84
|
-
self.
|
|
84
|
+
self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
|
|
85
85
|
|
|
86
86
|
def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
|
|
87
87
|
child_elements = self.findall(element, key)
|
|
@@ -154,12 +154,14 @@ class AbstractARXMLParser:
|
|
|
154
154
|
time_value.setValue(child_element.text)
|
|
155
155
|
return time_value
|
|
156
156
|
|
|
157
|
+
'''
|
|
157
158
|
def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> Boolean:
|
|
158
159
|
literal = self.getChildElementLiteral(short_name, element, key)
|
|
159
160
|
bool_value = Boolean()
|
|
160
161
|
bool_value.timestamp = literal.timestamp
|
|
161
162
|
bool_value.value = self._convertStringToBooleanValue(literal._value)
|
|
162
163
|
return bool_value
|
|
164
|
+
'''
|
|
163
165
|
|
|
164
166
|
def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
|
|
165
167
|
literal = self.getChildElementOptionalLiteral(element, key)
|
|
@@ -242,7 +244,7 @@ class AbstractARXMLParser:
|
|
|
242
244
|
child_element = self.find(element, key)
|
|
243
245
|
if (child_element is not None):
|
|
244
246
|
return self._getChildElementRefTypeDestAndValue(child_element)
|
|
245
|
-
self.
|
|
247
|
+
self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
|
|
246
248
|
|
|
247
249
|
def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
|
|
248
250
|
child_element = self.find(element, key)
|