armodel 1.7.5__py3-none-any.whl → 1.7.6__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/SystemTemplate/TransportProtocols.py

@@ -1,12 +1,33 @@
+from abc import ABCMeta
 from typing import List
+
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-class CanTpConfig(FibexElement):
+class TpConfig(FibexElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == ARObject:
+            raise NotImplementedError("ARObject is an abstract class.")
+        
         super().__init__(parent, short_name)
 
-class DoIpTpConfig(FibexElement):
+        self.communicationClusterRef = None                                 # type: RefType
+
+    def getCommunicationClusterRef(self):
+        return self.communicationClusterRef
+
+    def setCommunicationClusterRef(self, value):
+        if value is not None:
+            self.communicationClusterRef = value
+        return self
+
+
+class CanTpConfig(TpConfig):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+class DoIpTpConfig(TpConfig):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
@@ -28,3 +49,35 @@ class DoIpTpConfig(FibexElement):
         if value is not None:
             self.tpConnections.append(value)
         return self
+
+class LinTpConfig(TpConfig):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.tpAddresses = []                                       # type: List[TpAddress]
+        self.tpConnections = []                                     # type: List[LinTpConnection]
+        self.tpNodes = []                                           # type: List[LinTpNode]
+
+    def getTpAddresses(self):
+        return self.tpAddresses
+
+    def addTpAddress(self, value):
+        if value is not None:
+            self.tpAddresses.append(value)
+        return self
+
+    def getTpConnections(self):
+        return self.tpConnections
+
+    def addTpConnection(self, value):
+        if value is not None:
+            self.tpConnections.append(value)
+        return self
+
+    def getTpNodes(self):
+        return self.tpNodes
+
+    def setTpNode(self, value):
+        if value is not None:
+            self.tpNodes.append(value)
+        return self

armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py

@@ -310,7 +310,8 @@ class System(ARElement):
         return self
 
     def getFibexElementRefs(self):
-        return sorted(self.fibexElements, key= lambda i: i.getShortValue())
+        #return sorted(self.fibexElements, key= lambda i: i.getShortValue())
+        return self.fibexElements
 
     def addFibexElementRef(self, value):
         if value is not None:

armodel/parser/abstract_arxml_parser.py

@@ -32,14 +32,14 @@ class AbstractARXMLParser:
             tag = tag.tag
         if isinstance(tag, str):
             return tag.replace("{%s}" % self.nsmap["xmlns"], "")
-        raise ValueError("Invalid Tag type <%s>" % type(tag))
+        self.raiseError("Invalid Tag type <%s>" % type(tag))
 
     def _processOptions(self, options):
         if options:
             if 'warning' in options:
                 self.options['warning'] = options['warning']
 
-    def _raiseError(self, error_msg):
+    def raiseError(self, error_msg):
         if (self.options['warning'] == True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
@@ -51,7 +51,7 @@ class AbstractARXMLParser:
         else:
             raise NotImplementedError(error_msg)
         
-    def _raiseWarning(self, error_msg):
+    def raiseWarning(self, error_msg):
         self.logger.warning(error_msg)
         
     def getPureTagName(self, tag):
@@ -81,7 +81,7 @@ class AbstractARXMLParser:
             self.readARObjectAttributes(child_element, literal)
             literal._value = child_element.text
             return literal
-        self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
+        self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
         
     def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
         child_elements = self.findall(element, key)
@@ -244,7 +244,7 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
-        self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
+        self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
 
     def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
         child_element = self.find(element, key)