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

armodel/models/sw_component.py

@@ -1,180 +1,19 @@
-from typing import List, Dict
+from typing import List
 from abc import ABCMeta
 
+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, ParameterInAtomicSWCTypeInstanceRef,  POperationInAtomicSwcInstanceRef, 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, InternalBehavior, 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 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
-
-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 = {}
-        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 = ""
-
-    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)
+from .m2.autosar_templates.common_structure import ValueSpecification
 
 class AbstractEvent(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -184,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)
@@ -209,7 +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
+
+    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):
@@ -248,6 +94,14 @@ class OperationInvokedEvent(RTEEvent):
         super().__init__(parent, short_name)
         self.operation_iref = None      # type: POperationInAtomicSwcInstanceRef
 
+    @property
+    def operationIRef(self) -> POperationInAtomicSwcInstanceRef:
+        return self.operation_iref
+    
+    @operationIRef.setter
+    def operationIRef(self, value: POperationInAtomicSwcInstanceRef):
+        self.operation_iref = value
+
 class InitEvent(RTEEvent):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -334,30 +188,37 @@ class SwcInternalBehavior(InternalBehavior):
 
         self.handle_termination_and_restart = None      # type: str
         self.supports_multiple_instantiation = None     # type: ARBoolean
-        self._explicit_inter_runnable_variables = []    # type: List[VariableDataPrototype]
-        self._implicit_inter_runnable_variables = []    # type: List[VariableDataPrototype]
-        self._per_instance_memories = []                # type: List[PerInstanceMemory]
-        self._per_instance_parameters = []              # type: List[ParameterDataPrototype]
-        self._port_api_options = []                     # type: List[PortAPIOption]
+        self.explicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
+        self.implicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
+        self.per_instance_memories = []                 # type: List[PerInstanceMemory]
+        self.per_instance_parameters = []               # type: List[ParameterDataPrototype]
+        self.port_api_options = []                      # type: List[PortAPIOption]
+        self.included_data_type_sets = []               # type: List[IncludedDataTypeSet]
 
     def getExplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
-        return self._explicit_inter_runnable_variables
+        return self.explicit_inter_runnable_variables
     
     def getImplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
-        return self._implicit_inter_runnable_variables
+        return self.implicit_inter_runnable_variables
     
     def getPerInstanceMemories(self) -> List[PerInstanceMemory]:
-        return self._per_instance_memories
+        return self.per_instance_memories
     
-    def getParameterDataPrototypes(self) -> List[ParameterDataPrototype]:
-        return self._per_instance_parameters
+    def getPerInstanceParameters(self) -> List[ParameterDataPrototype]:
+        return self.per_instance_parameters
     
     def addPortAPIOption(self, option: PortAPIOption):
-        self._port_api_options.append(option)
+        self.port_api_options.append(option)
 
     def getPortAPIOptions(self) -> List[PortAPIOption]:
-        return self._port_api_options
+        return self.port_api_options
+    
+    def addIncludedDataTypeSet(self, set: IncludedDataTypeSet):
+        self.included_data_type_sets.append(set)
 
+    def getIncludedDataTypeSets(self) -> List[IncludedDataTypeSet]:
+        return self.included_data_type_sets
+    
     def createOperationInvokedEvent(self, short_name: str) -> OperationInvokedEvent:
         if (short_name not in self.elements):
             event = OperationInvokedEvent(self, short_name)
@@ -433,28 +294,28 @@ class SwcInternalBehavior(InternalBehavior):
         if (short_name not in self.elements):
             prototype = VariableDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self._explicit_inter_runnable_variables.append(prototype)
+            self.explicit_inter_runnable_variables.append(prototype)
         return self.elements[short_name]
     
     def createImplicitInterRunnableVariable(self, short_name: str) -> VariableDataPrototype:
         if (short_name not in self.elements):
             prototype = VariableDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self._implicit_inter_runnable_variables.append(prototype)
+            self.implicit_inter_runnable_variables.append(prototype)
         return self.elements[short_name]
     
     def createPerInstanceMemory(self, short_name: str) -> PerInstanceMemory:
         if (short_name not in self.elements):
             memory = PerInstanceMemory(self, short_name)
             self.elements[short_name] = memory
-            self._per_instance_memories.append(memory)
+            self.per_instance_memories.append(memory)
         return self.elements[short_name]
     
-    def createParameterDataPrototype(self, short_name: str) -> ParameterDataPrototype:
+    def createPerInstanceParameter(self, short_name: str) -> ParameterDataPrototype:
         if (short_name not in self.elements):
             prototype = ParameterDataPrototype(self, short_name)
             self.elements[short_name] = prototype
-            self._per_instance_parameters.append(prototype)
+            self.per_instance_parameters.append(prototype)
         return self.elements[short_name]
 
     def getVariableDataPrototypes(self) -> List[VariableDataPrototype]:

armodel/models/system_template/network_management.py

@@ -0,0 +1,7 @@
+
+from ..ar_object import ARObject
+from ..fibex.fibex_core import FibexElement
+
+class NmConfig(FibexElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/system_template/transport_protocols.py

@@ -0,0 +1,7 @@
+
+from ..ar_object import ARObject
+from ..fibex.fibex_core import FibexElement
+
+class CanTpConfig(FibexElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/timing.py

@@ -0,0 +1,91 @@
+
+from abc import ABCMeta
+from typing import List
+
+from armodel.models.ar_ref import RefType
+
+from ..models.general_structure import Identifiable
+from ..models.ar_object import ARObject
+
+class EOCExecutableEntityRefAbstract(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingConstraint:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+        
+        super().__init__(parent, short_name)
+        
+class EOCExecutableEntityRef(EOCExecutableEntityRefAbstract):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.successor_refs = []            # List[RefType]
+
+    def addSuccessorRef(self, ref: RefType):
+        self.successor_refs.append(ref)
+
+    def getSuccessorRefs(self) -> List[RefType]:
+        return self.successor_refs
+
+class TimingConstraint(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingConstraint:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+        self.timing_condition_ref = None                # type: RefType
+
+    @property
+    def timingConditionRef(self) -> RefType:
+        return self.timing_condition_ref
+
+    @timingConditionRef.setter
+    def timingConditionRef(self, ref: RefType):
+        self.timing_condition_ref = ref
+
+class ExecutionOrderConstraint(TimingConstraint):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.ordered_elements = []                      # type: List[EOCExecutableEntityRefAbstract]
+
+    def createEOCExecutableEntityRef(self, short_name: str)-> EOCExecutableEntityRef:
+        if short_name not in self.elements:
+            entity_ref = EOCExecutableEntityRef(self, short_name)
+            self.elements[short_name] = entity_ref
+            self.ordered_elements.append(entity_ref)
+        return self.elements[short_name]
+
+    def getOrderedElements(self) -> List[EOCExecutableEntityRefAbstract]:
+        return self.ordered_elements
+
+class TimingExtension(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingExtension:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+        self.timing_requirements = []           # Type: List[TimingConstraint]
+
+    def createExecutionOrderConstraint(self, short_name: str)-> ExecutionOrderConstraint:
+        if short_name not in self.elements:
+            constraint = ExecutionOrderConstraint(self, short_name)
+            self.elements[short_name] = constraint
+            self.timing_requirements.append(constraint)
+        return self.elements[short_name]
+
+    def getTimingRequirements(self) -> List[TimingConstraint]:
+        return self.timing_requirements
+
+class SwcTiming(TimingExtension):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+    

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
@@ -204,7 +207,7 @@ class AbstractARXMLParser:
         return None
 
     def getChildElementRefTypeList(self, element: ET.Element, key: str) -> List[RefType]:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             ref = RefType()
@@ -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):