armodel 1.9.1__py3-none-any.whl → 1.9.2__py3-none-any.whl

armodel/__init__.py

@@ -5,15 +5,14 @@ This library provides ARXML parser and writer functionality for automotive
 ECU software development.
 """
 
-__version__ = "1.9.1"
+__version__ = "1.9.2"
 
-from armodel.models import AUTOSAR
+# Import all model classes for direct access
+from armodel.models import *
 from armodel.parser import ARXMLParser, FileListParser
 from armodel.writer import ARXMLWriter
 
-__all__ = [
-    "AUTOSAR",
-    "ARXMLParser",
-    "FileListParser",
-    "ARXMLWriter",
-]
+# Export all model classes plus parser/writer
+import armodel.models
+_models_all = getattr(armodel.models, '__all__', [])
+__all__ = list(_models_all) + ["ARXMLParser", "FileListParser", "ARXMLWriter"]

armodel/cli/connector2xlsx_cli.py

@@ -10,8 +10,6 @@ from armodel.lib import InputFileParser
 from armodel.report import ConnectorXlsReport
 
 def main():
-    version = __version__
-
     ap = argparse.ArgumentParser()
     ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
     ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")

armodel/cli/connector_update_cli.py

@@ -10,8 +10,6 @@ from armodel.parser.arxml_parser import ARXMLParser
 from armodel.parser.connector_xlsx_parser import ConnectorXlsReader
 
 def main():
-    version = __version__
-
     ap = argparse.ArgumentParser()
     ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
     ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")

armodel/cli/memory_section_cli.py

@@ -9,8 +9,6 @@ from armodel.parser import ARXMLParser
 from armodel.lib import InputFileParser, SystemSignalAnalyzer
 
 def main():
-    version = __version__
-
     ap = argparse.ArgumentParser()
     ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
     ap.add_argument("-f", "--format", required= False, help= "Specify the short or long name of Sw-C. [short|long]")

armodel/cli/swc_list_cli.py

@@ -9,8 +9,6 @@ from armodel.parser import ARXMLParser
 from armodel.lib import InputFileParser, SwComponentAnalyzer
 
 def main():
-    version = __version__
-
     ap = argparse.ArgumentParser()
     ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
     ap.add_argument("-f", "--format", required= False, help= "Specify the short or long name of Sw-C. [short|long]")

armodel/cli/system_signal_cli.py

@@ -9,8 +9,6 @@ from armodel.parser import ARXMLParser
 from armodel.lib import InputFileParser, SystemSignalAnalyzer
 
 def main():
-    version = __version__
-
     ap = argparse.ArgumentParser()
     ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
     ap.add_argument("-f", "--format", required= False, help= "Specify the name format of SW-C. [short|full]")

armodel/lib/__init__.py

@@ -1,4 +1,3 @@
 
-from armodel.lib.cli_args_parser import InputFileParser
 from armodel.lib.sw_component import SwComponentAnalyzer
 from armodel.lib.system_signal import SystemSignalAnalyzer

armodel/models/M2/AUTOSARTemplates/AbstractPlatform/ApplicationDeferredDataType.py

@@ -0,0 +1,21 @@
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import (
+    ApplicationDataType,
+)
+
+
+class ApplicationDeferredDataType(ApplicationDataType):
+    """
+    A placeholder data type in which the precise application data type is
+    deferred to a later stage. Tags: atp.Status=draft
+    atp.recommendedPackage=ApplicationDataTypes
+
+    Sources:
+      - AUTOSAR_FO_TPS_AbstractPlatformSpecification.pdf (Page 37, Foundation
+      R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/AbstractPlatform/ApplicationInterface.py

@@ -0,0 +1,79 @@
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.ApplicationDesign.PortInterface.Field import (
+    Field,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    RefType,
+)
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import (
+    ClientServerOperation,
+)
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import (
+    PortInterface,
+)
+from typing import List
+
+
+class ApplicationInterface(PortInterface):
+    """
+    This represents the ability to define a PortInterface that consists of a
+    composition of commands (method calls), indications (events) and attributes
+    (fields) Tags: atp.Status=draft atp.recommendedPackage=Interfaces
+
+    Sources:
+      - AUTOSAR_FO_TPS_AbstractPlatformSpecification.pdf (Page 28, Foundation
+      R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # This represents the set of attributes defined in the context Abstract
+        # Platform ApplicationInterface.
+        # atpVariation.
+        self.attributes: List[Field] = []
+        # This represents the collection of commands or function optional data
+        # arguments) defined in the context ApplicationInterface.
+        # atpVariation.
+        self.commands: List[ClientServerOperation] = []
+        # This represents the collection of indication or events (with argument)
+        # defined in the context of an atpVariation.
+        self.indications: List[RefType] = []
+
+    def getAttributes(self) -> List[Field]:
+        return self.attributes
+
+    def setAttributes(self, value: List[Field]) -> "ApplicationInterface":
+        self.attributes = value
+        return self
+
+    def addAttribute(self, value: Field) -> "ApplicationInterface":
+        """Adds a value to the attributes list."""
+        self.attributes.append(value)
+        return self
+
+    def getCommands(self) -> List[ClientServerOperation]:
+        return self.commands
+
+    def setCommands(self, value: List[ClientServerOperation]) -> "ApplicationInterface":
+        self.commands = value
+        return self
+
+    def addCommand(self, value: ClientServerOperation) -> "ApplicationInterface":
+        """Adds a value to the commands list."""
+        self.commands.append(value)
+        return self
+
+    def getIndications(self) -> List[RefType]:
+        return self.indications
+
+    def setIndications(self, value: List[RefType]) -> "ApplicationInterface":
+        self.indications = value
+        return self
+
+    def addIndication(self, value: RefType) -> "ApplicationInterface":
+        """Adds a value to the indications list."""
+        self.indications.append(value)
+        return self

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

@@ -0,0 +1,2 @@
+from .ApplicationDeferredDataType import *
+from .ApplicationInterface import *

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/ApplicationDesign/PortInterface/Field.py

@@ -0,0 +1,52 @@
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AutosarDataPrototype
+from typing import Optional
+
+class Field(AutosarDataPrototype):
+    """
+    This meta-class represents the ability to define a piece of data that can be
+    accessed with read and/or write semantics. It is also possible to generate a
+    notification if the value of the data changes.
+    
+    Sources:
+      - AUTOSAR_FO_TPS_AbstractPlatformSpecification.pdf (Page 45, Foundation
+      R23-11)
+    """
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # This attribute controls whether read access is foreseen to.
+        self.hasGetter: Optional[Boolean] = None
+        # This attribute controls whether a notification semantics is this field.
+        self.hasNotifier: Optional[Boolean] = None
+        # This attribute controls whether write access is foreseen to.
+        self.hasSetter: Optional[Boolean] = None
+
+    def getHasGetter(self) -> Boolean:
+        return self.hasGetter
+
+
+    def setHasGetter(self, value: Boolean) -> "Field":
+        self.hasGetter = value
+        return self
+
+
+    def getHasNotifier(self) -> Boolean:
+        return self.hasNotifier
+
+
+    def setHasNotifier(self, value: Boolean) -> "Field":
+        self.hasNotifier = value
+        return self
+
+
+    def getHasSetter(self) -> Boolean:
+        return self.hasSetter
+
+
+    def setHasSetter(self, value: Boolean) -> "Field":
+        self.hasSetter = value
+        return self
+
+

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/ApplicationDesign/PortInterface/__init__.py

@@ -0,0 +1 @@
+from .Field import *

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/AdaptiveModule/PlatformModuleEthernetEndpointConfiguration.py

@@ -0,0 +1,63 @@
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import (
+    ARElement,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    Ip4AddressString,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    Ip6AddressString,
+)
+from typing import Any, Optional
+
+
+class PlatformModuleEthernetEndpointConfiguration(ARElement):
+    """
+    This meta-class defines the attributes for the configuration of a port,
+    protocol type and IP address of the communication on a VLAN. Tags:
+    atp.recommendedPackage=PlatformModuleEndpointConfigurations
+
+    Sources:
+      - AUTOSAR_FO_TPS_SecurityExtractTemplate.pdf (Page 65, Foundation R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # Type: EthernetCommunication.
+        # Reference to the CommunicationConnector (VLAN) for which the network
+        # configuration is defined.
+        self.communications: Optional[Any] = None
+        # Multicast IPv4 Address to which the message will be.
+        self.ipv4MulticastIps: Optional[Ip4AddressString] = None
+        # Multicast IPv6 Address to which the message will be.
+        self.ipv6MulticastIps: Optional[Ip6AddressString] = None
+
+    def getCommunications(self) -> Any:
+        return self.communications
+
+    def setCommunications(
+        self, value: Any
+    ) -> "PlatformModuleEthernetEndpointConfiguration":
+        self.communications = value
+        return self
+
+    def getIpv4MulticastIps(self) -> Ip4AddressString:
+        return self.ipv4MulticastIps
+
+    def setIpv4MulticastIps(
+        self, value: Ip4AddressString
+    ) -> "PlatformModuleEthernetEndpointConfiguration":
+        self.ipv4MulticastIps = value
+        return self
+
+    def getIpv6MulticastIps(self) -> Ip6AddressString:
+        return self.ipv6MulticastIps
+
+    def setIpv6MulticastIps(
+        self, value: Ip6AddressString
+    ) -> "PlatformModuleEthernetEndpointConfiguration":
+        self.ipv6MulticastIps = value
+        return self

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/AdaptiveModule/__init__.py

@@ -0,0 +1,3 @@
+from .PlatformModuleEthernetEndpointConfiguration import PlatformModuleEthernetEndpointConfiguration
+
+__all__ = ['PlatformModuleEthernetEndpointConfiguration']

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/CryptoDeployment/CryptoKeySlot.py

@@ -0,0 +1,128 @@
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.CryptoDeployment.CryptoKeySlotContent import (  # noqa: F401
+    CryptoKeySlotContent,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import (
+    Identifiable,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    Boolean,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    PositiveInteger,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import (
+    String,
+)
+from typing import Any, List, Optional
+
+
+class CryptoKeySlot(Identifiable):
+    """
+    This meta-class represents the ability to define a concrete key to be used
+    for a crypto operation. Tags: atp.ManifestKind=MachineManifest
+
+    Sources:
+      - AUTOSAR_FO_TPS_SecurityExtractTemplate.pdf (Page 57, Foundation R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # This attribute defines whether a shadow copy of this Key shall be allocated
+        # to enable rollback of a failed Key campaign (see interface BeginTransaction).
+        self.allocateShadows: Optional[Boolean] = None
+        # This attribute defines a crypto algorithm restriction (kAlgId without
+        # restriction).
+        # The algorithm can be family & length, mode, padding.
+        # Providers can support some crypto are not well known/ standardized today,
+        # doesn’t provide a concrete list of identifiers and doesn’t suppose usage
+        # identifiers.
+        # Instead of this a provider supplier string names of supported algorithms in
+        # The name of a crypto follow the rules defined in the specification for
+        # Adaptive Platform.
+        # 97 Document ID 980: AUTOSAR_FO_TPS_SecurityExtractTemplate Template R23-11.
+        self.cryptoAlgIds: Optional[String] = None
+        # Type: CryptoObjectTypeEnum.
+        # Object type that can be stored in the slot.
+        # If this field "Undefined" then mSlotCapacity must be larger then 0.
+        self.cryptoObjects: Optional[Any] = None
+        # Type: CryptoKeySlotAllowed.
+        # Restricts how this keySlot may be used Tags: atp.
+        # Status=candidate.
+        self.keySlotAlloweds: Optional[Any] = None
+        # Type: CryptoKeySlotContent.
+        # Restriction of allowed usage of a key stored to the slot.
+        # Tags: atp.
+        # Status=candidate.
+        self.keySlotContents: List[Any] = []
+        # Capacity of the slot in bytes to be reserved by the stack use case is to
+        # define this value in case that is undefined and the slot size can deduced
+        # from cryptoObjectType and cryptoAlgId.
+        # slot size can be deduced from cryptoObject cryptoAlgId.
+        self.slotCapacitys: Optional[PositiveInteger] = None
+        # Type: CryptoKeySlotType.
+        # This attribute defines whether the keySlot is exclusively by the Application;
+        # or whether it is used by Stack managed by a Key Manager Application.
+        self.slotTypes: Optional[Any] = None
+
+    def getAllocateShadows(self) -> Boolean:
+        return self.allocateShadows
+
+    def setAllocateShadows(self, value: Boolean) -> "CryptoKeySlot":
+        self.allocateShadows = value
+        return self
+
+    def getCryptoAlgIds(self) -> String:
+        return self.cryptoAlgIds
+
+    def setCryptoAlgIds(self, value: String) -> "CryptoKeySlot":
+        self.cryptoAlgIds = value
+        return self
+
+    def getCryptoObjects(self) -> Any:
+        return self.cryptoObjects
+
+    def setCryptoObjects(self, value: Any) -> "CryptoKeySlot":
+        self.cryptoObjects = value
+        return self
+
+    def getKeySlotAlloweds(self) -> Any:
+        return self.keySlotAlloweds
+
+    def setKeySlotAlloweds(self, value: Any) -> "CryptoKeySlot":
+        self.keySlotAlloweds = value
+        return self
+
+    def getKeySlotContents(self) -> List[Any]:
+        return self.keySlotContents
+
+    def setKeySlotContents(self, value: List[Any]) -> "CryptoKeySlot":
+        self.keySlotContents = value
+        return self
+
+    def createKeySlotContent(self, short_name: str) -> CryptoKeySlotContent:
+        """Creates and adds a keySlotContent to this CryptoKeySlot."""
+        if short_name not in self.elements:
+            new_element = CryptoKeySlotContent(self, short_name)
+            # Only call addElement if child has getShortName method (Referrable subclasses)
+            if hasattr(new_element, "getShortName"):
+                self.addElement(new_element)
+            self.keySlotContents.append(new_element)
+        return new_element
+
+    def getSlotCapacitys(self) -> PositiveInteger:
+        return self.slotCapacitys
+
+    def setSlotCapacitys(self, value: PositiveInteger) -> "CryptoKeySlot":
+        self.slotCapacitys = value
+        return self
+
+    def getSlotTypes(self) -> Any:
+        return self.slotTypes
+
+    def setSlotTypes(self, value: Any) -> "CryptoKeySlot":
+        self.slotTypes = value
+        return self

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/CryptoDeployment/CryptoKeySlotContent.py

@@ -0,0 +1,19 @@
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import (
+    Identifiable,
+)
+
+
+class CryptoKeySlotContent(Identifiable):
+    """
+    This meta-class represents the restriction of allowed usage of a key stored
+    to the slot. Tags: atp.Status=candidate
+
+    Sources:
+      - AUTOSAR_FO_TPS_SecurityExtractTemplate.pdf (Page 57, Foundation R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/CryptoDeployment/__init__.py

@@ -0,0 +1,4 @@
+from .CryptoKeySlot import CryptoKeySlot
+from .CryptoKeySlotContent import CryptoKeySlotContent
+
+__all__ = ['CryptoKeySlot', 'CryptoKeySlotContent']

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/Firewall/__init__.py

@@ -1,5 +1,5 @@
-from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.FirewallRule import FirewallRule
-from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.FirewallRuleProps import FirewallRuleProps
-from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.StateDependentFirewall import StateDependentFirewall
+from .FirewallRule import FirewallRule
+from .FirewallRuleProps import FirewallRuleProps
+from .StateDependentFirewall import StateDependentFirewall
 
 __all__ = ['FirewallRule', 'FirewallRuleProps', 'StateDependentFirewall']

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/IntrusionDetectionSystem/IdsPlatformInstantiation.py

@@ -0,0 +1,52 @@
+from abc import ABC
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import (
+    Identifiable,
+)
+from typing import Any, List, Optional
+
+
+class IdsPlatformInstantiation(Identifiable, ABC):
+    """
+    This meta-class acts as an abstract base class for platform modules that
+    implement the intrusion detection system. Tags: atp.Status=candidate
+
+    Sources:
+      - AUTOSAR_FO_TPS_SecurityExtractTemplate.pdf (Page 63, Foundation R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) is IdsPlatformInstantiation:
+            raise TypeError("IdsPlatformInstantiation is an abstract class.")
+        super().__init__(parent, short_name)
+
+        # Type: PlatformModule.
+        # This association contains the network configuration that shall be applied to
+        # an instance of an IDS entity.
+        # atp.
+        # Status=candidate.
+        self.networks: List[Any] = []
+        # Type: TimeBaseResource.
+        # This reference identifies the applicable time base atpVariation.
+        self.timeBases: Optional[Any] = None
+
+    def getNetworks(self) -> List[Any]:
+        return self.networks
+
+    def setNetworks(self, value: List[Any]) -> "IdsPlatformInstantiation":
+        self.networks = value
+        return self
+
+    def addNetwork(self, value: Any) -> "IdsPlatformInstantiation":
+        """Adds a value to the networks list."""
+        self.networks.append(value)
+        return self
+
+    def getTimeBases(self) -> Any:
+        return self.timeBases
+
+    def setTimeBases(self, value: Any) -> "IdsPlatformInstantiation":
+        self.timeBases = value
+        return self

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/IntrusionDetectionSystem/IdsmModuleInstantiation.py

@@ -0,0 +1,19 @@
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.IntrusionDetectionSystem.IdsPlatformInstantiation import (  # noqa: F401
+    IdsPlatformInstantiation,
+)
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import (
+    ARObject,
+)
+
+
+class IdsmModuleInstantiation(IdsPlatformInstantiation):
+    """
+    This meta-class defines the attributes for the IdsM configuration on a
+    specific machine. Tags: atp.Status=candidate
+
+    Sources:
+      - AUTOSAR_FO_TPS_SecurityExtractTemplate.pdf (Page 63, Foundation R23-11)
+    """
+
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/IntrusionDetectionSystem/__init__.py

@@ -0,0 +1,4 @@
+from .IdsPlatformInstantiation import IdsPlatformInstantiation
+from .IdsmModuleInstantiation import IdsmModuleInstantiation
+
+__all__ = ['IdsPlatformInstantiation', 'IdsmModuleInstantiation']

armodel/models/M2/AUTOSARTemplates/AdaptivePlatform/PlatformModuleDeployment/__init__.py

@@ -1,3 +1,25 @@
-from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.Firewall import FirewallRule, FirewallRuleProps, StateDependentFirewall
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.AdaptiveModule import (  # noqa: F401
+    PlatformModuleEthernetEndpointConfiguration,
+)
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.CryptoDeployment import (  # noqa: F401
+    CryptoKeySlot,
+)
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.Firewall import (  # noqa: F401
+    FirewallRule,
+    FirewallRuleProps,
+    StateDependentFirewall,
+)
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment.IntrusionDetectionSystem import (  # noqa: F401
+    IdsPlatformInstantiation,
+    IdsmModuleInstantiation,
+)
 
-__all__ = ['FirewallRule', 'FirewallRuleProps', 'StateDependentFirewall']
+__all__ = [
+    'PlatformModuleEthernetEndpointConfiguration',
+    'CryptoKeySlot',
+    'FirewallRule',
+    'FirewallRuleProps',
+    'StateDependentFirewall',
+    'IdsPlatformInstantiation',
+    'IdsmModuleInstantiation',
+]

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

@@ -1,3 +1,3 @@
-from armodel.models.M2.AUTOSARTemplates.PlatformModuleDeployment import FirewallRule, FirewallRuleProps, StateDependentFirewall
+from armodel.models.M2.AUTOSARTemplates.AdaptivePlatform.PlatformModuleDeployment import FirewallRule, FirewallRuleProps, StateDependentFirewall
 
 __all__ = ['FirewallRule', 'FirewallRuleProps', 'StateDependentFirewall']

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior/BswAsynchronousServerCallReturnsEvent.py

@@ -3,7 +3,7 @@ This module defines BSW asynchronous server call returns event in AUTOSAR.
 """
 
 from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswEvent import BswEvent
+from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswEvent
 
 
 class BswAsynchronousServerCallReturnsEvent(BswEvent):

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior/BswInterruptEvent.py

@@ -2,7 +2,7 @@
 This module defines BSW interrupt event in AUTOSAR.
 """
 
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswEvent import BswEvent
+from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswEvent
 
 
 class BswInterruptEvent(BswEvent):

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior/BswModeManagerErrorEvent.py

@@ -2,7 +2,7 @@
 This module defines BSW mode manager error event in AUTOSAR.
 """
 
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswEvent import BswEvent
+from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswEvent
 
 
 class BswModeManagerErrorEvent(BswEvent):