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

armodel/models/port_prototype.py

@@ -1,95 +1,6 @@
 from typing import List
 
-from .m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
+from .m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
 from .general_structure import ARObject, Identifiable
 from .ar_ref import TRefType
 
-class PortPrototype(Identifiable):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-class AbstractProvidedPortPrototype(PortPrototype):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.provided_com_specs = []  # type: List[PPortComSpec]
-
-    def _validateRPortComSpec(self, com_spec: PPortComSpec):
-        if isinstance(com_spec, NonqueuedSenderComSpec):
-            if com_spec.dataElementRef == None:
-                raise ValueError(
-                    "operation of NonqueuedSenderComSpec is invalid")
-            if com_spec.dataElementRef.dest != "VARIABLE-DATA-PROTOTYPE":
-                raise ValueError(
-                    "Invalid operation dest of NonqueuedSenderComSpec")
-        elif isinstance(com_spec, ServerComSpec):
-            pass
-        elif isinstance(com_spec, QueuedSenderComSpec):
-            pass
-        elif isinstance(com_spec, ModeSwitchSenderComSpec):
-            pass
-        else:
-            raise ValueError("Unsupported com spec")
-
-    def addProvidedComSpec(self, com_spec):
-        self._validateRPortComSpec(com_spec)
-        self.provided_com_specs.append(com_spec)
-
-    def getProvidedComSpecs(self) -> List[PPortComSpec]:
-        return self.provided_com_specs
-
-    def getNonqueuedSenderComSpecs(self) -> List[NonqueuedSenderComSpec]:
-        return filter(lambda c: isinstance(c, NonqueuedSenderComSpec), self.provided_com_specs)
-
-
-class AbstractRequiredPortPrototype(PortPrototype):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.required_com_specs = []  # type: List[RPortComSpec]
-
-    def _validateRPortComSpec(self, com_spec: RPortComSpec):
-        if (isinstance(com_spec, ClientComSpec)):
-            if (com_spec.operationRef == None):
-                raise ValueError(
-                    "The operation reference of ClientComSpec has not been defined.")
-            if (com_spec.operationRef.dest != "CLIENT-SERVER-OPERATION"):
-                raise ValueError("Invalid operation dest of ClientComSpec.")
-        elif (isinstance(com_spec, NonqueuedReceiverComSpec)):
-            if (com_spec.dataElementRef == None):
-                raise ValueError(
-                    "The data element reference of NonqueuedReceiverComSpec has not been defined.")
-            if (com_spec.dataElementRef.dest != "VARIABLE-DATA-PROTOTYPE"):
-                raise ValueError(
-                    "Invalid date element dest of NonqueuedReceiverComSpec.")
-        elif isinstance(com_spec, QueuedReceiverComSpec):
-            pass
-        elif isinstance(com_spec, ModeSwitchReceiverComSpec):
-            pass
-        else:
-            raise ValueError("Unsupported RPortComSpec <%s>" % type(com_spec))
-
-    def addRequiredComSpec(self, com_spec: RPortComSpec):
-        self._validateRPortComSpec(com_spec)
-        self.required_com_specs.append(com_spec)
-
-    def getRequiredComSpecs(self) -> List[RPortComSpec]:
-        return self.required_com_specs
-
-    def getClientComSpecs(self) -> List[ClientComSpec]:
-        return filter(lambda c: isinstance(c, ClientComSpec), self.required_com_specs)
-
-    def getNonqueuedReceiverComSpecs(self) -> List[NonqueuedReceiverComSpec]:
-        return filter(lambda c: isinstance(c, NonqueuedReceiverComSpec), self.required_com_specs)
-
-
-class PPortPrototype(AbstractProvidedPortPrototype):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.provided_interface_tref = TRefType()
-class RPortPrototype(AbstractRequiredPortPrototype):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.required_interface_tref = TRefType()

armodel/models/service_needs.py

@@ -1,7 +1,9 @@
 
 from abc import ABCMeta
+
+from .m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import AutosarParameterRef, AutosarVariableRef
 from .general_structure import Identifiable
-from .ar_ref import AutosarVariableRef, AutosarParameterRef, RefType
+from .ar_ref import RefType
 from .ar_object import ARBoolean, ARLiteral, ARObject
 
 

armodel/models/sw_component.py

@@ -1,6 +1,8 @@
 from typing import List
 from abc import ABCMeta
 
+from .m2.autosar_templates.sw_component_template.components import SwComponentType
+from .m2.autosar_templates.sw_component_template.composition.instance_refs import POperationInAtomicSwcInstanceRef
 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
@@ -8,11 +10,10 @@ 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 InnerPortGroupInCompositionInstanceRef, POperationInAtomicSwcInstanceRef, TRefType
-from .ar_ref import RefType, PortInCompositionTypeInstanceRef, PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
-from .port_prototype import RPortPrototype, PPortPrototype, PortPrototype
-from .data_prototype import ParameterDataPrototype, VariableDataPrototype
+from .general_structure import Identifiable, ARObject
+from .ar_ref import TRefType
+from .ar_ref import RefType
+from .m2.autosar_templates.sw_component_template.data_type.data_prototypes import ParameterDataPrototype, VariableDataPrototype
 from .m2.autosar_templates.common_structure import ValueSpecification
 
 class AbstractEvent(Identifiable):
@@ -333,60 +334,7 @@ class SwcInternalBehavior(InternalBehavior):
     def getRunnableEntity(self, short_name) -> RunnableEntity:
         return self.elements[short_name]
     
-class PortGroup(Identifiable):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self._inner_group_iref = []    # type: List[InnerPortGroupInCompositionInstanceRef]
-        self._outer_port_ref = []      # type: List[RefType]
 
-    def addInnerGroupIRef(self, iref: InnerPortGroupInCompositionInstanceRef):
-        self._inner_group_iref.append(iref)
-
-    def getInnerGroupIRefs(self) -> List[InnerPortGroupInCompositionInstanceRef]:
-        return self._inner_group_iref
-    
-    def addOuterPortRef(self, ref: RefType):
-        self._outer_port_ref.append(ref)
-
-    def getOuterPortRefs(self) -> List[RefType]:
-        return self._outer_port_ref
-
-class SwComponentType(ARElement):
-    __metaclass__ = ABCMeta
-
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-    def createPPortPrototype(self, short_name: str) -> PPortPrototype:
-        prototype = PPortPrototype(self, short_name)
-        if (short_name not in self.elements):
-            self.elements[short_name] = prototype
-        return self.elements[short_name]
-
-    def createRPortPrototype(self, short_name) -> RPortPrototype:
-        prototype = RPortPrototype(self, short_name)
-        if (short_name not in self.elements):
-            self.elements[short_name] = prototype
-        return self.elements[short_name]
-    
-    def createPortGroup(self, short_name) -> PortGroup:
-        port_group = PortGroup(self, short_name)
-        if (short_name not in self.elements):
-            self.elements[short_name] = port_group
-        return self.elements[short_name]
-
-    def getPPortPrototypes(self) -> List[PPortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, PPortPrototype), self.elements.values()), key= lambda o: o.short_name))
-
-    def getRPortPrototypes(self) -> List[RPortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, RPortPrototype), self.elements.values()), key= lambda o: o.short_name))
-    
-    def getPortPrototypes(self) -> List[PortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, PortPrototype), self.elements.values()), key= lambda o: o.short_name))
-    
-    def getPortGroups(self) -> List[PortGroup]:
-        return list(sorted(filter(lambda c: isinstance(c, PortGroup), self.elements.values()), key= lambda o: o.short_name))
 
 class AtomicSwComponentType(SwComponentType):
     __metaclass__ = ABCMeta
@@ -434,89 +382,4 @@ class ServiceSwComponentType(AtomicSwComponentType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-class SwConnector(Identifiable):
-    __metaclass__ = ABCMeta
-
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.mapping_ref = None     # type: RefType
-
-class AssemblySwConnector(SwConnector):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.provider_iref = None   # type: PPortInCompositionInstanceRef
-        self.requester_iref = None  # type: RPortInCompositionInstanceRef
-
-class DelegationSwConnector(SwConnector):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.inner_port_iref = None # type: PortInCompositionTypeInstanceRef
-        self.outer_port_ref  = None # type: RefType
-
-class PassThroughSwConnector(SwConnector):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.provided_outer_port_ref = None # type: RefType
-        self.required_outer_port_ref = None # type: RefType
-
-class SwComponentPrototype(Identifiable):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.type_tref = RefType()
-
-class CompositionSwComponentType(SwComponentType):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.constant_value_mapping_refs = []   # type: List[RefType]
-        self._data_type_mapping_refs = []       # type: List[RefType]
-        self.instantiation_rte_event_props = [] # type: List[InstantiationRTEEventProps]
-
-    def removeAllAssemblySwConnector(self):
-        for sw_connector in self.getAssemblySwConnectors():
-            self.elements.pop(sw_connector.short_name)
-
-    def removeAllDelegationSwConnector(self):
-        for sw_connector in self.getDelegationSwConnectors():
-            self.elements.pop(sw_connector.short_name)
-
-    def createAssemblySwConnector(self, short_name: str) -> AssemblySwConnector:
-        if (short_name not in self.elements):
-            connector = AssemblySwConnector(self, short_name)
-            self.elements[short_name] = connector
-        return self.elements[short_name]
-    
-    def createDelegationSwConnector(self, short_name: str) -> DelegationSwConnector:
-        if short_name not in self.elements:
-            connector = DelegationSwConnector(self, short_name)
-            self.elements[short_name] = connector
-        return self.elements[short_name]
-
-    def getAssemblySwConnectors(self) -> List[AssemblySwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, AssemblySwConnector), self.elements.values()), key = lambda c: c.short_name))
-    
-    def getDelegationSwConnectors(self) -> List[DelegationSwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, DelegationSwConnector), self.elements.values()), key = lambda c: c.short_name))
-    
-    def getSwConnectors(self) -> List[SwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, SwConnector), self.elements.values()), key = lambda c: c.short_name))
-    
-    def createSwComponentPrototype(self, short_name: str) -> SwComponentPrototype:
-        if (short_name not in self.elements):
-            connector = SwComponentPrototype(self, short_name)
-            self.elements[short_name] = connector
-        return self.elements[short_name] 
-
-    def getSwComponentPrototypes(self) -> List[SwComponentPrototype]:
-        return list(filter(lambda e: isinstance(e, SwComponentPrototype), self.elements.values()))
-    
-    def addDataTypeMapping(self, data_type_mapping_ref: RefType):
-        self._data_type_mapping_refs.append(data_type_mapping_ref)
 
-    def getDataTypeMappings(self) -> List[RefType]:
-        return self._data_type_mapping_refs

armodel/parser/__init__.py

@@ -1 +1,2 @@
-from .arxml_parser import ARXMLParser
+from .arxml_parser import ARXMLParser
+from .file_parser import FileListParser

armodel/parser/abstract_arxml_parser.py

@@ -7,7 +7,7 @@ import re
 import logging
 import xml.etree.ElementTree as ET
 
-from ..models.ar_package import AUTOSAR
+from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 from ..models.ar_ref import RefType
 from ..models.ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical, ARObject
 from ..models.general_structure import Limit