armodel 1.5.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

armodel/models/sw_component.py

@@ -1,220 +1,19 @@
-from typing import List, Dict
+from typing import List
 from abc import ABCMeta
 
-from .rpt_scenario import ModeAccessPointIdent
-
+from .m2.autosar_templates.sw_component_template.components.instance_refs import RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
+from .m2.autosar_templates.sw_component_template.swc_internal_behavior import RunnableEntity
 from .internal_behavior import IncludedDataTypeSet, InternalBehavior
 from .service_mapping import RoleBasedPortAssignment
 from .per_instance_memory import PerInstanceMemory
 from .service_needs import NvBlockNeeds, RoleBasedDataAssignment, ServiceNeeds
 from .ar_object import ARBoolean, ARLiteral
 from .general_structure import ARElement, Identifiable, ARObject
-from .ar_ref import AutosarParameterRef, AutosarVariableRef, InnerPortGroupInCompositionInstanceRef, POperationInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, ROperationInAtomicSwcInstanceRef, TRefType
+from .ar_ref import InnerPortGroupInCompositionInstanceRef, POperationInAtomicSwcInstanceRef, TRefType
 from .ar_ref import RefType, PortInCompositionTypeInstanceRef, PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
-from .ar_ref import RVariableInAtomicSwcInstanceRef, RModeInAtomicSwcInstanceRef
 from .port_prototype import RPortPrototype, PPortPrototype, PortPrototype
 from .data_prototype import ParameterDataPrototype, VariableDataPrototype
-from .common_structure import ExecutableEntity, ValueSpecification
-
-class VariableAccess(Identifiable):
-    def __init__(self, parent: ARObject, short_name):
-        super().__init__(parent, short_name)
-        self.accessed_variable_ref = AutosarVariableRef()
-        self.accessed_variable_ref.parent = self
-        self._parent = parent
-        self.local_variable_ref = None  # type: RefType
-
-class AbstractAccessPoint(Identifiable):
-    __metaclass__ = ABCMeta
-
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == AbstractAccessPoint:
-            raise NotImplementedError("ARObject is an abstract class.")
-        
-        super().__init__(parent, short_name)
-
-        self.return_value_provision = None  
-
-class ParameterAccess(AbstractAccessPoint):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.accessed_parameter = None  # type: AutosarParameterRef
-        self.sw_data_def_props = None   #   
-
-class ServerCallPoint(AbstractAccessPoint):
-    __metaclass__ = ABCMeta
-
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-        self.operation_iref = None  # type: ROperationInAtomicSwcInstanceRef
-        self.timeout = None         # type: float
-
-class SynchronousServerCallPoint(ServerCallPoint):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.called_from_within_exclusive_area_ref = None   # type: RefType
-
-class ModeAccessPoint(ARObject):
-    def __init__(self):
-        super().__init__()
-
-        self.ident = None                   # type: ModeAccessPointIdent
-        self.mode_group_iref = None         # type: RModeGroupInAtomicSWCInstanceRef
-
-    @property
-    def modeGroupIRef(self) -> RModeGroupInAtomicSWCInstanceRef:
-        return self.mode_group_iref
-    
-    @modeGroupIRef.setter
-    def modeGroupIRef(self, value: RModeGroupInAtomicSWCInstanceRef):
-        self.mode_group_iref = value
-
-class AsynchronousServerCallPoint(ServerCallPoint):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-class AsynchronousServerCallResultPoint(ServerCallPoint):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.asynchronous_server_call_point_ref = None          # type: RefType
-
-    @property
-    def asynchronousServerCallPointRef(self) -> RefType:
-        return self.asynchronous_server_call_point_ref
-    
-    @asynchronousServerCallPointRef.setter
-    def asynchronousServerCallPointRef(self, value: RefType):
-        self.asynchronous_server_call_point_ref = value
-
-class InternalTriggeringPoint(AbstractAccessPoint):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name) 
-
-        self.sw_impl_policy = None
-
-class RunnableEntity(ExecutableEntity):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-        self.can_be_invoked_concurrently = None         # type: ARBoolean
-        self.data_read_accesses = {}                    # type: Dict[str, VariableAccess]
-        self.data_received_point_by_arguments = {}      # type: Dict[str, VariableAccess]
-        self.data_received_point_by_values = {}         # type: Dict[str, VariableAccess]
-        self.data_send_points = {}                      # type: Dict[str, VariableAccess]
-        self.data_write_accesses = {}                   # type: Dict[str, VariableAccess]
-        self.written_local_variables = {}               # type: Dict[str, VariableAccess]
-        self.read_local_variables = {}                  # type: Dict[str, VariableAccess]
-        self.external_triggering_points = {}            # type: Dict[InternalTriggeringPoint]
-        self.internal_triggering_points = {}
-        self.mode_access_points = []                    # type: List[ModeAccessPoint]
-        self.mode_switch_points = {}
-        self.parameter_accesses = {}                    # type: Dict[str, ParameterAccess]
-        self.server_call_points = {}                    # type: Dict[str, ServerCallPoint]
-        self.wait_points = {}                           # type: Dict[str, WaitPoint]
-        self.symbol = ""
-
-    @property
-    def canBeInvokedConcurrently(self) -> ARBoolean:
-        return self.can_be_invoked_concurrently
-    
-    @canBeInvokedConcurrently.setter
-    def canBeInvokedConcurrently(self, value: ARBoolean):
-        self.can_be_invoked_concurrently = value
-
-    def _createVariableAccess(self, short_name, variable_accesses: Dict[str, VariableAccess]):
-        if (short_name not in variable_accesses):
-            variable_access = VariableAccess(self, short_name)
-            variable_accesses[short_name] = variable_access
-        return variable_accesses[short_name]
-
-    def createDataReadAccess(self, short_name: str) -> VariableAccess:
-       return self._createVariableAccess(short_name, self.data_read_accesses)
-
-    def getDataReadAccesses(self) -> List[VariableAccess]:
-        return sorted(self.data_read_accesses.values(), key=lambda v: v.short_name)
-    
-    def createDataWriteAccess(self, short_name: str) -> VariableAccess:
-       return self._createVariableAccess(short_name, self.data_write_accesses)
-
-    def getDataWriteAccesses(self) -> List[VariableAccess]:
-        return sorted(self.data_write_accesses.values(), key=lambda v: v.short_name)
-
-    def createDataReceivePointByArgument(self, short_name: str) -> VariableAccess:
-       return self._createVariableAccess(short_name, self.data_received_point_by_arguments)
-
-    def getDataReceivePointByArguments(self) -> List[VariableAccess]:
-        return sorted(self.data_received_point_by_arguments.values(), key=lambda v: v.short_name)
-
-    def createDataReceivePointByValue(self, short_name: str) -> VariableAccess:
-       return self._createVariableAccess(short_name, self.data_received_point_by_values)
-
-    def getDataReceivePointByValues(self) -> List[VariableAccess]:
-        return sorted(self.data_received_point_by_values.values(), key=lambda v: v.short_name)
-
-    def createDataSendPoint(self, short_name: str) -> VariableAccess:
-        return self._createVariableAccess(short_name, self.data_send_points)
-
-    def getDataSendPoints(self) -> List[VariableAccess]:
-        return sorted(self.data_send_points.values(), key=lambda v: v.short_name)
-
-    def createReadLocalVariable(self, short_name: str) -> VariableAccess:
-        return self._createVariableAccess(short_name, self.read_local_variables)
-
-    def getReadLocalVariables(self) -> List[VariableAccess]:
-        return sorted(self.read_local_variables.values(), key=lambda v: v.short_name)
-
-    def createWrittenLocalVariable(self, short_name: str) -> VariableAccess:
-        return self._createVariableAccess(short_name, self.written_local_variables)
-
-    def getWrittenLocalVariables(self) -> List[VariableAccess]:
-        return sorted(self.written_local_variables.values(), key=lambda v: v.short_name)
-    
-    def createParameterAccess(self, short_name: str) -> ParameterAccess:
-        if (short_name not in self.server_call_points):
-            parameter_access = ParameterAccess(self, short_name)
-            self.parameter_accesses[short_name] = parameter_access
-        return self.parameter_accesses[short_name]
-    
-    def getParameterAccesses(self) -> List[ParameterAccess]:
-        return sorted(self.parameter_accesses.values(), key= lambda o: o.short_name)
-    
-    def createSynchronousServerCallPoint(self, short_name: str) -> SynchronousServerCallPoint:
-        if (short_name not in self.server_call_points):
-            server_call_point = SynchronousServerCallPoint(self, short_name)
-            self.server_call_points[short_name] = server_call_point
-        return self.server_call_points[short_name]
-
-    def createAsynchronousServerCallPoint(self, short_name: str) -> AsynchronousServerCallPoint:
-        if (short_name not in self.server_call_points):
-            server_call_point = AsynchronousServerCallPoint(self, short_name)
-            self.server_call_points[short_name] = server_call_point
-        return self.server_call_points[short_name]
-
-    def getSynchronousServerCallPoint(self) -> List[ServerCallPoint]:
-        return filter(lambda o: isinstance(o, SynchronousServerCallPoint), self.getServerCallPoints())
-    
-    def getAsynchronousServerCallPoint(self) -> List[ServerCallPoint]:
-        return filter(lambda o: isinstance(o, AsynchronousServerCallPoint), self.getServerCallPoints())
-
-    def getServerCallPoints(self) -> List[ServerCallPoint]:
-        return sorted(self.server_call_points.values(), key=lambda v: v.short_name)
-
-    def createInternalTriggeringPoint(self, short_name: str) -> InternalTriggeringPoint:
-        if (short_name not in self.elements):
-            point = InternalTriggeringPoint(self, short_name)
-            self.elements[point.short_name] = point
-        return self.elements[point.short_name]
-
-    def getInternalTriggeringPoints(self) -> List[InternalTriggeringPoint]:
-        return filter(lambda o: isinstance(o, InternalTriggeringPoint), self.elements)
-    
-    def addModeAccessPoint(self, point: ModeAccessPoint):
-        self.mode_access_points.append(point)
-
-    def getModeAccessPoints(self) -> List[ModeAccessPoint]:
-        return self.mode_access_points
+from .m2.autosar_templates.common_structure import ValueSpecification
 
 class AbstractEvent(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -224,8 +23,8 @@ class RTEEvent(AbstractEvent):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.start_on_event_ref = None  # type: RefType
-        self.disabled_mode_irefs = []   # type: List[RModeInAtomicSwcInstanceRef]
+        self.start_on_event_ref = None      # type: RefType
+        self.disabled_mode_irefs = []       # type: List[RModeInAtomicSwcInstanceRef]
 
     def addDisabledModeIRef(self, iref: RModeInAtomicSwcInstanceRef):
         self.disabled_mode_irefs.append(iref)
@@ -249,15 +48,14 @@ class DataReceivedEvent(RTEEvent):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.data_iref = None               # type: RVariableInAtomicSwcInstanceRef
+        self.dataIRef = None                   # type: RVariableInAtomicSwcInstanceRef
 
-    @property
-    def dataIRef(self) -> RVariableInAtomicSwcInstanceRef:
-        return self.data_iref
-    
-    @dataIRef.setter
-    def dataIRef(self, value: RVariableInAtomicSwcInstanceRef):
-        self.data_iref = value
+    def getDataIRef(self):
+        return self.dataIRef
+
+    def setDataIRef(self, value):
+        self.dataIRef = value
+        return self
 
 class SwcModeSwitchEvent(RTEEvent):
     def __init__(self, parent: ARObject, short_name: str):

armodel/parser/abstract_arxml_parser.py

@@ -45,6 +45,9 @@ class AbstractARXMLParser:
         else:
             raise ValueError(error_msg)
         
+    def _raiseWarning(self, error_msg):
+        self.logger.warning(error_msg)
+        
     def getPureTagName(self, tag):
         return re.sub(r'\{[\w:\/.]+\}(\w+)', r'\1', tag)
 
@@ -105,7 +108,7 @@ class AbstractARXMLParser:
     def getChildElementOptionalFloatValue(self, element: ET.Element, key: str) -> ARFloat:
         child_element = element.find("./xmlns:%s" % key, self.nsmap)
         float_value = None
-        if (child_element is not None):
+        if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
             float_value.setValue(child_element.text)
         return float_value
@@ -234,6 +237,12 @@ class AbstractARXMLParser:
         
         self.logger.debug("schemaLocation %s" % document.schema_location)
 
+    def getShortName(self, element: ET.Element) -> str:
+        child_element = self.find(element, "SHORT-NAME")
+        if child_element is None:
+            raise ValueError("Short Name is required")
+        return child_element.text
+
     def convert_find_key(self, key: str) -> str:
         keys = key.split("/")
         for idx, item in enumerate(keys):