armodel 1.8.4__py3-none-any.whl → 1.8.6__py3-none-any.whl

armodel/cli/uuid_checker_cli.py

@@ -57,6 +57,7 @@ def perform_uuid_duplicate_check(args):
             parser.load(filename, document)
 
         with open(args.OUTPUT, 'w') as f_out:
+            logger.info("Writing the duplicate UUIDs to <%s>", args.OUTPUT)
             for uuid in document.getDuplicateUUIDs():
                 ar_objects = document.getARObjectByUUID(uuid)
                 if len(ar_objects) > 1:

armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py

@@ -11,7 +11,7 @@ from ...M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
 from ...M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
 from ...M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
 from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Referrable
+from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, CollectableElement, Referrable
 from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationDataType, DataTypeMap
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType, CompositionSwComponentType, PortPrototype
@@ -206,9 +206,14 @@ class AbstractAUTOSAR(CollectableElement):
     def getRootSwCompositionPrototype(self):
         return self.rootSwCompositionPrototype
 
-    def setRootSwCompositionPrototype(self, value):
+    def setRootSwCompositionPrototype(self, value: ARElement):
         if value is not None:
-            self.rootSwCompositionPrototype = value
+            if self.rootSwCompositionPrototype is not None:
+                if value.getShortName() != self.rootSwCompositionPrototype.getShortName():
+                    raise ValueError("RootSwCompositionPrototype already set to <%s>, cannot set to <%s>."
+                                     % (self.rootSwCompositionPrototype.getShortName(), value.getShortName()))
+            else:
+                self.rootSwCompositionPrototype = value
         return self
 
     def addImplementationBehaviorMap(self, impl: str, behavior: str) -> Implementation:

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py

@@ -143,8 +143,9 @@ class ARPackage(Identifiable, CollectableElement):
         return self.arPackages[short_name]
 
     def getElement(self, short_name: str, type=None) -> Referrable:
-        if (short_name in self.arPackages):
-            return self.arPackages[short_name]
+        if type is ARPackage or type is None:
+            if short_name in self.arPackages:
+                return self.arPackages[short_name]
         return CollectableElement.getElement(self, short_name, type)
 
     def createEcuAbstractionSwComponentType(self, short_name: str) -> EcuAbstractionSwComponentType:

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py

@@ -216,6 +216,25 @@ class NvRequireComSpec(RPortComSpec):
     def __init__(self):
         super().__init__()
 
+        self.initValue: ValueSpecification = None
+        self.variableRef: RefType = None
+
+    def getInitValue(self):
+        return self.initValue
+    
+    def setInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.initValue = value
+        return self
+    
+    def getVariableRef(self):
+        return self.variableRef
+    
+    def setVariableRef(self, value: RefType):
+        if value is not None:
+            self.variableRef = value
+        return self
+
 
 class ParameterRequireComSpec(RPortComSpec):
     def __init__(self):
@@ -574,6 +593,39 @@ class ServerComSpec(PPortComSpec):
         if transformationComSpecProps is not None:
             self.transformationComSpecProps.append(transformationComSpecProps)
         return self
+
+
+class NvProvideComSpec(PPortComSpec):
+    def __init__(self):
+        super().__init__()
+
+        self.ramBlockInitValue: ValueSpecification = None
+        self.romBlockInitValue: ValueSpecification = None
+        self.variableRef: RefType = None
+
+    def getRamBlockInitValue(self):
+        return self.ramBlockInitValue
+    
+    def setRamBlockInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.ramBlockInitValue = value
+        return self
+    
+    def getRomBlockInitValue(self):
+        return self.romBlockInitValue
+    
+    def setRomBlockInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.romBlockInitValue = value
+        return self
+    
+    def getVariableRef(self):
+        return self.variableRef
+    
+    def setVariableRef(self, value: RefType):
+        if value is not None:
+            self.variableRef = value
+        return self
     
 
 class NonqueuedReceiverComSpec(ReceiverComSpec):

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py

@@ -303,14 +303,14 @@ class AtomicSwComponentType(SwComponentType, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.internalBehavior = None                        # type: SwcInternalBehavior
-        self.symbolProps = None                             # type: SymbolProps
+        self.internalBehavior: SwcInternalBehavior = None
+        self.symbolProps: SymbolProps = None
 
     def getInternalBehavior(self):
         return self.internalBehavior
 
     def createSwcInternalBehavior(self, short_name) -> SwcInternalBehavior:
-        if (not self.IsElementExists(short_name)):
+        if (not self.IsElementExists(short_name, SwcInternalBehavior)):
             behavior = SwcInternalBehavior(self, short_name)
             self.addElement(behavior)
             self.internalBehavior = behavior

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/__init__.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef, RPortInCompositionInstanceRef
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import RPortInCompositionInstanceRef
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
@@ -11,40 +12,34 @@ class SwComponentPrototype(Identifiable):
 
         self.typeTRef = None                       # type: RefType
 
-    def getTypeTRef(self):
+    def getTypeTRef(self) -> RefType:
         return self.typeTRef
 
-    def setTypeTRef(self, value):
+    def setTypeTRef(self, value: RefType):
         self.typeTRef = value
         return self
 
-class SwConnector(Identifiable, metaclass = ABCMeta):
+
+class SwConnector(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.mappingRef = None                      # type: RefType
+        self.mappingRef: RefType = None
 
-    def getMappingRef(self):
+    def getMappingRef(self) -> RefType:
         return self.mappingRef
 
-    def setMappingRef(self, value):
+    def setMappingRef(self, value: RefType):
         self.mappingRef = value
         return self
 
+
 class AssemblySwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.mappingRef = None          # type: RefType
-        self.providerIRef = None        # type: PPortInCompositionInstanceRef
-        self.requesterIRef = None       # type: RPortInCompositionInstanceRef
-
-    def getMappingRef(self):
-        return self.mappingRef
-
-    def setMappingRef(self, value):
-        self.mappingRef = value
-        return self
+        self.providerIRef: PPortInCompositionInstanceRef = None
+        self.requesterIRef: RPortInCompositionInstanceRef = None
 
     def getProviderIRef(self) -> PPortInCompositionInstanceRef:
         return self.providerIRef
@@ -60,24 +55,25 @@ class AssemblySwConnector(SwConnector):
         self.requesterIRef = value
         return self
 
+
 class DelegationSwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        self.innerPortIRref = None                          # type: PortInCompositionTypeInstanceRef
-        self.outerPortRef = None                            # type: RefType
+        self.innerPortIRref: PortInCompositionTypeInstanceRef = None
+        self.outerPortRef: RefType = None
 
-    def getInnerPortIRref(self):
+    def getInnerPortIRref(self) -> PortInCompositionTypeInstanceRef:
         return self.innerPortIRref
 
-    def setInnerPortIRref(self, value):
+    def setInnerPortIRref(self, value: PortInCompositionTypeInstanceRef):
         self.innerPortIRref = value
         return self
 
-    def getOuterPortRef(self):
+    def getOuterPortRef(self) -> RefType:
         return self.outerPortRef
 
-    def setOuterPortRef(self, value):
+    def setOuterPortRef(self, value: RefType):
         self.outerPortRef = value
         return self
 
@@ -86,20 +82,19 @@ class PassThroughSwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.providedOuterPortRef = None                    # type: RefType
-        self.requiredOuterPortRef = None                    # type: RefType
+        self.providedOuterPortRef: RefType = None
+        self.requiredOuterPortRef: RefType = None
 
-    def getProvidedOuterPortRef(self):
+    def getProvidedOuterPortRef(self) -> RefType:
         return self.providedOuterPortRef
 
-    def setProvidedOuterPortRef(self, value):
+    def setProvidedOuterPortRef(self, value: RefType):
         self.providedOuterPortRef = value
         return self
 
-    def getRequiredOuterPortRef(self):
+    def getRequiredOuterPortRef(self) -> RefType:
         return self.requiredOuterPortRef
 
-    def setRequiredOuterPortRef(self, value):
+    def setRequiredOuterPortRef(self, value: RefType):
         self.requiredOuterPortRef = value
         return self
-        

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py

@@ -6,6 +6,7 @@ from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiab
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from .....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
 
+
 class ParameterAccess(AbstractAccessPoint):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py

@@ -86,6 +86,7 @@ class VariableInAtomicSWCTypeInstanceRef(AtpInstanceRef):
         self.targetDataPrototypeRef = value
         return self
     
+
 class ParameterInAtomicSWCTypeInstanceRef(AtpInstanceRef):
     def __init__(self):
         super().__init__()
@@ -131,13 +132,13 @@ class ParameterInAtomicSWCTypeInstanceRef(AtpInstanceRef):
         self.targetDataPrototypeRef = value
         return self
 
+
 class AutosarParameterRef(ARObject):
     def __init__(self):
         super().__init__()
-
-        # type: ParameterInAtomicSWCTypeInstanceRef
-        self.autosarParameterIRef = None
-        self.localParameterRef = None               # type: RefType
+        
+        self.autosarParameterIRef: ParameterInAtomicSWCTypeInstanceRef = None
+        self.localParameterRef: RefType = None               # type: RefType
 
     def getAutosarParameterIRef(self):
         return self.autosarParameterIRef