armodel 1.7.4__py3-none-any.whl → 1.7.5__py3-none-any.whl

armodel/cli/file_list_cli.py

@@ -0,0 +1,70 @@
+import argparse
+import pkg_resources
+import logging
+import sys
+import os.path
+
+from ..parser import FileListParser
+
+def format_filename(filename, type: str):
+    path, file = os.path.split(filename)
+    base, ext = os.path.splitext(file)
+    return os.path.join(path, base + "_" + type + ext)
+        
+def main():
+    version = pkg_resources.require("armodel")[0].version
+
+    ap = argparse.ArgumentParser()
+    ap.description = "Parse the folder to generate ARXML file list. <%s>" % version
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("--absolute", required= False, help="Absolute path or relative Path", action= "store_true")
+    ap.add_argument("Input", help = "The path contains ARXML file", nargs='+')
+    ap.add_argument("Output", help = "The text contains ARXML file list.")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)s] : %(message)s')
+
+    stdout_handler = logging.StreamHandler(sys.stderr)
+    stdout_handler.setFormatter(formatter)
+
+    base_path = os.path.dirname(args.Output)
+    log_file = os.path.join(base_path, 'armodel_file_list.log')
+
+    if os.path.exists(log_file):
+        os.remove(log_file)
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    logger.setLevel(logging.DEBUG)
+    file_handler.setLevel(logging.DEBUG)
+
+    if args.verbose:
+        stdout_handler.setLevel(logging.DEBUG)
+        
+    else:
+        stdout_handler.setLevel(logging.INFO)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(stdout_handler)    
+
+    try:
+        file_parser = FileListParser()
+        file_parser.parse(args.Input)
+            
+        with open(args.Output, "w") as f_out:
+            for filename in file_parser.get_file_list():
+                if args.absolute:
+                    f_out.write("%s\n" % os.path.realpath(filename))
+                else:
+                    f_out.write("%s\n" % os.path.relpath(filename))
+
+    except Exception as e:
+        #print(e)
+        raise e
+
+if __name__ == "__main__":
+    main()

armodel/models/M2/AUTOSARTemplates/DiagnosticExtract/DiagnosticContribution.py

@@ -0,0 +1,47 @@
+from typing import List
+
+from .....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import NameToken, RefType
+from .....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+
+
+class DiagnosticServiceTable(ARElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.diagnosticConnectionRefs = []                              # type: List[RefType]
+        self.diagnosticServiceInstanceRefs = []                         # type: List[RefType]
+        self.ecuInstanceRef = None                                      # type: RefType
+        self.protocolKind = None                                        # type: NameToken
+
+    def getDiagnosticConnectionRefs(self):
+        return self.diagnosticConnectionRefs
+
+    def addDiagnosticConnectionRef(self, value):
+        if value is not None:
+            self.diagnosticConnectionRefs.append(value)
+        return self
+
+    def getDiagnosticServiceInstanceRefs(self):
+        return self.diagnosticServiceInstanceRefs
+
+    def addDiagnosticServiceInstanceRef(self, value):
+        if value is not None:
+            self.diagnosticServiceInstanceRefs.append(value)
+        return self
+
+    def getEcuInstanceRef(self):
+        return self.ecuInstanceRef
+
+    def setEcuInstanceRef(self, value):
+        if value is not None:
+            self.ecuInstanceRef = value
+        return self
+
+    def getProtocolKind(self):
+        return self.protocolKind
+
+    def setProtocolKind(self, value):
+        if value is not None:
+            self.protocolKind = value
+        return self

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

@@ -1,4 +1,5 @@
 from typing import Dict, List
+
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Identifier, RefType, ReferrableSubtypesEnum
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
 from .....M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
@@ -10,11 +11,12 @@ from .....M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
 from .....M2.MSR.AsamHdo.ComputationMethod import CompuMethod
 from .....M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
 from .....M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
+from .....M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
 from .....M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
 from .....M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 from .....M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
 from .....M2.AUTOSARTemplates.CommonStructure.FlatMap import FlatMap
-from .....M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
+from .....M2.AUTOSARTemplates.DiagnosticExtract.DiagnosticContribution import DiagnosticServiceTable
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Identifiable, Referrable
 from .....M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
@@ -22,12 +24,14 @@ from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import Appl
 from .....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
 from .....M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
+from .....M2.AUTOSARTemplates.SystemTemplate.DiagnosticConnection import DiagnosticConnection
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway
-from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import DcmIPdu, ISignal, ISignalGroup, ISignalIPdu, ISignalIPduGroup, NPdu, NmPdu, SecuredIPdu, SystemSignal, SystemSignalGroup
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import DcmIPdu, GeneralPurposeIPdu, GeneralPurposePdu, ISignal, ISignalGroup, ISignalIPdu, ISignalIPduGroup, MultiplexedIPdu, NPdu, NmPdu, SecureCommunicationPropsSet, SecuredIPdu, SystemSignal, SystemSignalGroup, UserDefinedIPdu, UserDefinedPdu
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CanCluster, LinCluster
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinUnconditionalFrame
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology import EthernetCluster
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetCommunication import SoAdRoutingGroup
 from .....M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
 from .....M2.AUTOSARTemplates.CommonStructure import ConstantSpecification
@@ -36,7 +40,7 @@ from .....M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucModuleConfigura
 from .....M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerInterface, ModeSwitchInterface, ParameterInterface, PortInterfaceMappingSet, SenderReceiverInterface, TriggerInterface
 from .....M2.AUTOSARTemplates.SystemTemplate import System
 from .....M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import NmConfig
-from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
+from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig, DoIpTpConfig
 
 class ReferenceBase(ARObject):
     def __init__(self):
@@ -482,6 +486,66 @@ class ARPackage(Identifiable, CollectableElement):
             cluster = EthernetCluster(self, short_name)
             self.addElement(cluster)
         return self.getElement(short_name)
+    
+    def createDiagnosticConnection(self, short_name: str) -> DiagnosticConnection:
+        if (short_name not in self.elements):
+            cluster = DiagnosticConnection(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createDiagnosticServiceTable(self, short_name: str) -> DiagnosticServiceTable:
+        if (short_name not in self.elements):
+            cluster = DiagnosticServiceTable(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createMultiplexedIPdu(self, short_name: str) -> MultiplexedIPdu:
+        if (short_name not in self.elements):
+            cluster = MultiplexedIPdu(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createUserDefinedIPdu(self, short_name: str) -> UserDefinedIPdu:
+        if (short_name not in self.elements):
+            cluster = UserDefinedIPdu(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createUserDefinedPdu(self, short_name: str) -> UserDefinedPdu:
+        if (short_name not in self.elements):
+            cluster = UserDefinedPdu(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createGeneralPurposeIPdu(self, short_name: str) -> GeneralPurposeIPdu:
+        if (short_name not in self.elements):
+            cluster = GeneralPurposeIPdu(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createGeneralPurposePdu(self, short_name: str) -> GeneralPurposePdu:
+        if (short_name not in self.elements):
+            cluster = GeneralPurposePdu(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createSecureCommunicationPropsSet(self, short_name: str) -> SecureCommunicationPropsSet:
+        if (short_name not in self.elements):
+            cluster = SecureCommunicationPropsSet(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createSoAdRoutingGroup(self, short_name: str) -> SoAdRoutingGroup:
+        if (short_name not in self.elements):
+            cluster = SoAdRoutingGroup(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createDoIpTpConfig(self, short_name: str) -> DoIpTpConfig:
+        if (short_name not in self.elements):
+            cluster = DoIpTpConfig(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
 
     def getApplicationPrimitiveDataTypes(self) -> List[ApplicationPrimitiveDataType]:
         return list(sorted(filter(lambda a: isinstance(a, ApplicationPrimitiveDataType), self.elements.values()), key= lambda o:o.short_name))

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

@@ -431,6 +431,15 @@ class RefType(ARObject):
         self.value = value
         return self
 
+    def getShortValue(self):
+        if self.value is None:
+            raise ValueError("Invalid value of RefType")
+        m = re.match(r'\/[\w\/]+\/(\w+)', self.value)
+        if m:
+            return m.group(1)
+        return self.value
+
+
 class TRefType(RefType):
     def __init__(self):
         super().__init__()

armodel/models/M2/AUTOSARTemplates/SystemTemplate/DiagnosticConnection.py

@@ -0,0 +1,58 @@
+from typing import List
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+
+class DiagnosticConnection(ARElement):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.functionalRequestRefs = []                         # type: List[RefType]
+        self.periodicResponseUudtRefs = []                      # type: List[RefType]
+        self.physicalRequestRef = None                          # type: RefType
+        self.responseRef = None                                 # type: RefType
+        self.responseOnEventRef = None                          # type: RefType
+
+    def getFunctionalRequestRefs(self):
+        return self.functionalRequestRefs
+
+    def addFunctionalRequestRef(self, value):
+        if value is not None:
+            self.functionalRequestRefs.append(value)
+        return self
+
+    def getPeriodicResponseUudtRefs(self):
+        return self.periodicResponseUudtRefs
+
+    def addPeriodicResponseUudtRef(self, value):
+        if value is not None:
+            self.periodicResponseUudtRefs.append(value)
+        return self
+
+    def getPhysicalRequestRef(self):
+        return self.physicalRequestRef
+
+    def setPhysicalRequestRef(self, value):
+        if value is not None:
+            self.physicalRequestRef = value
+        return self
+
+    def getResponseRef(self):
+        return self.responseRef
+
+    def setResponseRef(self, value):
+        if value is not None:
+            self.responseRef = value
+        return self
+
+    def getResponseOnEventRef(self):
+        return self.responseOnEventRef
+
+    def setResponseOnEventRef(self, value):
+        if value is not None:
+            self.responseOnEventRef = value
+        return self
+
+
+    
+
+

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetCommunication.py

@@ -1,7 +1,7 @@
 from typing import List
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Identifier, PositiveInteger, RefType, TimeValue
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable, Referrable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable, Identifiable, Referrable
 
 class SocketConnection(Describable):
     def __init__(self):
@@ -227,3 +227,18 @@ class SocketConnectionBundle(Referrable):
     def setUdpChecksumHandling(self, value):
         self.udpChecksumHandling = value
         return self
+
+class SoAdRoutingGroup(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # type: EventGroupControlTypeEnum
+        self.eventGroupControlType = None
+
+    def getEventGroupControlType(self):
+        return self.eventGroupControlType
+
+    def setEventGroupControlType(self, value):
+        if value is not None:
+            self.eventGroupControlType = value
+        return self

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetTopology.py

@@ -163,5 +163,119 @@ class EthernetCommunicationConnector(CommunicationConnector):
         self.pathMtuTimeout = value
         return self
     
+class RequestResponseDelay(ARObject):
+    def __init__(self):
+        super().__init__()
 
+        self.maxValue = None                                        # type: TimeValue
+        self.minValue = None                                        # type: TimeValue
+
+    def getMaxValue(self):
+        return self.maxValue
+
+    def setMaxValue(self, value):
+        if value is not None:
+            self.maxValue = value
+        return self
+
+    def getMinValue(self):
+        return self.minValue
+
+    def setMinValue(self, value):
+        if value is not None:
+            self.minValue = value
+        return self
+
+class InitialSdDelayConfig(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.initialDelayMaxValue = None                            # type: TimeValue
+        self.initialDelayMinValue = None                            # type: TimeValue
+        self.initialRepetitionsBaseDelay = None                     # type: TimeValue
+        self.initialRepetitionsMax = None                           # type: PositiveInteger
+
+    def getInitialDelayMaxValue(self):
+        return self.initialDelayMaxValue
+
+    def setInitialDelayMaxValue(self, value):
+        if value is not None:
+            self.initialDelayMaxValue = value
+        return self
+
+    def getInitialDelayMinValue(self):
+        return self.initialDelayMinValue
+
+    def setInitialDelayMinValue(self, value):
+        if value is not None:
+            self.initialDelayMinValue = value
+        return self
+
+    def getInitialRepetitionsBaseDelay(self):
+        return self.initialRepetitionsBaseDelay
+
+    def setInitialRepetitionsBaseDelay(self, value):
+        if value is not None:
+            self.initialRepetitionsBaseDelay = value
+        return self
+
+    def getInitialRepetitionsMax(self):
+        return self.initialRepetitionsMax
+
+    def setInitialRepetitionsMax(self, value):
+        if value is not None:
+            self.initialRepetitionsMax = value
+        return self
+
+    
+class SdClientConfig(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.capabilityRecord = None                                # type: TagWithOptionalValue
+        self.clientServiceMajorVersion = None                       # type: PositiveInteger
+        self.clientServiceMinorVersion = None                       # type: PositiveInteger
+        self.initialFindBehavior = None                             # type: InitialSdDelayConfig
+        self.requestResponseDelay = None                            # type: RequestResponseDelay
+        self.ttl = None                                             # type: PositiveInteger
+
+    def getClientServiceMajorVersion(self):
+        return self.clientServiceMajorVersion
+
+    def setClientServiceMajorVersion(self, value):
+        if value is not None:
+            self.clientServiceMajorVersion = value
+        return self
+
+    def getClientServiceMinorVersion(self):
+        return self.clientServiceMinorVersion
+
+    def setClientServiceMinorVersion(self, value):
+        if value is not None:
+            self.clientServiceMinorVersion = value
+        return self
+
+    def getInitialFindBehavior(self):
+        return self.initialFindBehavior
+
+    def setInitialFindBehavior(self, value):
+        if value is not None:
+            self.initialFindBehavior = value
+        return self
+
+    def getRequestResponseDelay(self):
+        return self.requestResponseDelay
+
+    def setRequestResponseDelay(self, value):
+        if value is not None:
+            self.requestResponseDelay = value
+        return self
+
+    def getTtl(self):
+        return self.ttl
+
+    def setTtl(self, value):
+        if value is not None:
+            self.ttl = value
+        return self
 

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/NetworkEndpoint.py

@@ -2,7 +2,7 @@ from abc import ABCMeta
 from typing import List
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Ip4AddressString, Ip6AddressString, PositiveInteger, String
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Ip4AddressString, Ip6AddressString, PositiveInteger, String, TimeValue
 
 class NetworkEndpointAddress(ARObject, metaclass = ABCMeta):
     def __init__(self):
@@ -156,6 +156,109 @@ class Ipv6Configuration(NetworkEndpointAddress):
     def setIpv6AddressSource(self, value):
         self.ipv6AddressSource = value
         return self
+    
+class DoIpEntity(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.doIpEntityRole = None                                  # type: DoIpEntityRoleEnum
+
+    def getDoIpEntityRole(self):
+        return self.doIpEntityRole
+
+    def setDoIpEntityRole(self, value):
+        if value is not None:
+            self.doIpEntityRole = value
+        return self
+    
+class TimeSyncClientConfiguration(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.orderedMasters = []                                    # type: List[OrderedMaster]
+        self.timeSyncTechnology = None                              # type: TimeSyncTechnologyEnum
+
+    def getOrderedMasters(self):
+        return self.orderedMasters
+
+    def addOrderedMaster(self, value):
+        if value is not None:
+            self.orderedMasters.append(value)
+        return self
+
+    def getTimeSyncTechnology(self):
+        return self.timeSyncTechnology
+
+    def setTimeSyncTechnology(self, value):
+        if value is not None:
+            self.timeSyncTechnology = value
+        return self
+
+
+class TimeSyncServerConfiguration(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.priority = None                                        # type: PositiveInteger
+        self.syncInterval = None                                    # type: TimeValue
+        self.timeSyncServerIdentifier = None                        # type: String
+        self.timeSyncTechnology = None                              # type: TimeSyncTechnologyEnum
+
+    def getPriority(self):
+        return self.priority
+
+    def setPriority(self, value):
+        if value is not None:
+            self.priority = value
+        return self
+
+    def getSyncInterval(self):
+        return self.syncInterval
+
+    def setSyncInterval(self, value):
+        if value is not None:
+            self.syncInterval = value
+        return self
+
+    def getTimeSyncServerIdentifier(self):
+        return self.timeSyncServerIdentifier
+
+    def setTimeSyncServerIdentifier(self, value):
+        if value is not None:
+            self.timeSyncServerIdentifier = value
+        return self
+
+    def getTimeSyncTechnology(self):
+        return self.timeSyncTechnology
+
+    def setTimeSyncTechnology(self, value):
+        if value is not None:
+            self.timeSyncTechnology = value
+        return self
+
+    
+class TimeSynchronization(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.timeSyncClient = None                                  # type: TimeSyncClientConfiguration
+        self.timeSyncServer = None                                  # type: TimeSyncServerConfiguration
+
+    def getTimeSyncClient(self):
+        return self.timeSyncClient
+
+    def setTimeSyncClient(self, value):
+        if value is not None:
+            self.timeSyncClient = value
+        return self
+
+    def getTimeSyncServer(self):
+        return self.timeSyncServer
+
+    def setTimeSyncServer(self, value):
+        if value is not None:
+            self.timeSyncServer = value
+        return self
 
 
 class InfrastructureServices(ARObject):