armodel 1.7.7__py3-none-any.whl → 1.7.8__py3-none-any.whl

armodel/cli/arxml_dump_cli.py

@@ -15,15 +15,17 @@ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPack
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 from ..parser import ARXMLParser
 
-def show_variable_access(indent:int, variable_access: VariableAccess):
-    if (variable_access.getAccessedVariableRef() != None):
+
+def show_variable_access(indent: int, variable_access: VariableAccess):
+    if (variable_access.getAccessedVariableRef() is not None):
         accessed_variable_ref = variable_access.getAccessedVariableRef()
-        if (accessed_variable_ref.getAutosarVariableInImplDatatype() != None):
+        if (accessed_variable_ref.getAutosarVariableInImplDatatype() is not None):
             autosar_variable_in_impl_datatype = accessed_variable_ref.getAutosarVariableInImplDatatype()
             print("%s: %s" % (" " * indent, autosar_variable_in_impl_datatype.getPortPrototypeRef().getValue()))
             print("%s: %s" % (" " * indent, autosar_variable_in_impl_datatype.getTargetDataPrototypeRef().getValue()))
 
-def show_port(indent:int, port_prototype: PortPrototype):
+
+def show_port(indent: int, port_prototype: PortPrototype):
     if (isinstance(port_prototype, RPortPrototype)):
         print("%s-RPort: %s (%s)" % (" " * indent, port_prototype.short_name, port_prototype.getRequiredInterfaceTRef().getValue()))
         for client_com_spec in port_prototype.getClientComSpecs():
@@ -37,25 +39,28 @@ def show_port(indent:int, port_prototype: PortPrototype):
     else:
         raise ValueError("Unsupported Port prototype")
 
+
 def show_type(indent: int, data_type: ImplementationDataType):
     print("%s-Implementation Type: %s (%s)" % (" " * indent, data_type.short_name, data_type.parent.full_name))
     print("%s                    : %s" % (" " * indent, data_type.getCategory()))
-    if (data_type.getSwDataDefProps() != None):
-        if (data_type.getSwDataDefProps().getBaseTypeRef() != None):
+    if (data_type.getSwDataDefProps() is not None):
+        if (data_type.getSwDataDefProps().getBaseTypeRef() is not None):
             base_type_ref = data_type.getSwDataDefProps().getBaseTypeRef()
             print("%s                    : %s (%s)" % (" " * indent, base_type_ref.getValue(), base_type_ref.getDest()))
             
-        if (data_type.getSwDataDefProps().getImplementationDataTypeRef() != None):
+        if (data_type.getSwDataDefProps().getImplementationDataTypeRef() is not None):
             implementation_data_type_ref = data_type.getSwDataDefProps().getImplementationDataTypeRef()
             print("%s                    : %s (%s)" % (" " * indent, implementation_data_type_ref.getValue(), implementation_data_type_ref.getDest()))
 
+
 def show_data_type_mapping(indent: int, mapping_set: DataTypeMappingSet):
     print("%s- Data Mapping Set <%s>:" % (" " * indent, mapping_set.short_name))
     for mapping in mapping_set.getDataTypeMaps():
         print("%s- appl: %s" % (" " * (indent + 2), mapping.applicationDataTypeRef.value))
         print("%s- impl: %s" % (" " * (indent + 4), mapping.implementationDataTypeRef.value))
 
-def show_behavior(indent:int, behavior: SwcInternalBehavior):
+
+def show_behavior(indent: int, behavior: SwcInternalBehavior):
     print("%s-Behavior: %s" % (" " * indent, behavior.short_name))
     for runnable in behavior.getRunnableEntities():
         print("%s-Runnable: %s" % (" " * (indent + 2), runnable.short_name))
@@ -68,7 +73,7 @@ def show_behavior(indent:int, behavior: SwcInternalBehavior):
             show_variable_access(indent + 9, variable_access)
         for server_call_point in runnable.getServerCallPoints():
             print("%s-scp : %s" % (" " * (indent + 4), variable_access.short_name))
-            if (server_call_point.operation_iref != None):
+            if (server_call_point.operation_iref is not None):
                 print("%s: %s" % (" " * (indent + 9), server_call_point.getOperationIRef().getContextRPortRef().getValue()))
                 print("%s: %s" % (" " * (indent + 9), server_call_point.getOperationIRef().getTargetRequiredOperationRef().getValue()))
     for event in behavior.getOperationInvokedEvents():
@@ -79,26 +84,29 @@ def show_behavior(indent:int, behavior: SwcInternalBehavior):
         print("   - TimingEvent : %s (%d ms)" % (event.short_name, event.period_ms))
         print("                 : %s" % (event.start_on_event_ref.value))
 
+
 def show_sw_component(indent: int, sw_component: SwComponentType):
     print("%s%s" % (" " * indent, sw_component.short_name))
     for prototype in sw_component.getRPortPrototypes():
         show_port(indent + 2, prototype)
     for prototype in sw_component.getPPortPrototypes():
         show_port(indent + 2, prototype)
-    show_behavior(indent + 2, sw_component.internal_behavior) 
+    show_behavior(indent + 2, sw_component.internal_behavior)
+
 
 def show_sender_receiver_interface(indent: int, sr_interface: SenderReceiverInterface):
     print("%s%s" % (" " * indent, sr_interface.short_name))
     for data_element in sr_interface.getDataElements():
         print("%sData Element:%s (%s) " % (" " * (indent + 2), data_element.short_name, data_element.getTypeTRef().getValue()))
 
+
 def show_client_server_interface(indent: int, cs_interface: ClientServerInterface):
     print("%s%s" % (" " * indent, cs_interface.short_name))
     for operation in cs_interface.getOperations():
         print("%sOperation:%s" % (" " * (indent + 2), operation.short_name))
         for argument in operation.getArgumentDataPrototypes():
-            print("%s         :%s (%s: %s)" % (" " * (indent + 2), argument.short_name, 
-                argument.direction, argument.typeTRef.value))
+            print("%s         :%s (%s: %s)" % (" " * (indent + 2), argument.short_name, argument.direction, argument.typeTRef.value))
+
 
 def show_bsw_internal_behavior(indent: int, behavior: BswInternalBehavior):
     document = AUTOSAR.getInstance()
@@ -111,31 +119,33 @@ def show_bsw_internal_behavior(indent: int, behavior: BswInternalBehavior):
     for event in behavior.getBswTimingEvents():
         print("%s-%s" % (" " * (indent + 2), event.short_name))
         print("%s-%s: %s" % (" " * (indent + 4), "StartsOnEventRef", event.startsOnEventRef.value))
-        starts_on_event = document.find(event.startsOnEventRef.value) # type: BswModuleEntity
+        starts_on_event = document.find(event.startsOnEventRef.value)  # type: BswModuleEntity
         print("%s-%s: %s" % (" " * (indent + 4), "StartsOnEvent", starts_on_event.short_name))
         print("%s-%s: %s" % (" " * (indent + 4), "ImplementedEntryRef", starts_on_event.implementedEntryRef.value))
-        implemented_entry = document.find(starts_on_event.implementedEntryRef.value) # type: BswModuleEntry
+        implemented_entry = document.find(starts_on_event.implementedEntryRef.value)  # type: BswModuleEntry
         print("%s-%s: %s" % (" " * (indent + 4), "ImplementedEntry", implemented_entry.short_name))
         print("%s-%s: %d" % (" " * (indent + 6), "Service Id", implemented_entry.serviceId))
 
+
 def show_bsw_module_description(indent: int, description: BswModuleDescription):
     print("%s-%s" % (" " * indent, description.short_name))
 
     for behavior in description.getBswInternalBehaviors():
         show_bsw_internal_behavior(indent + 2, behavior)
 
+
 def show_ar_package(indent: int, ar_package: ARPackage):
     print("%s-%s (Pkg)" % (" " * indent, ar_package.short_name))
      
     for sub_package in ar_package.getARPackages():
         show_ar_package(indent + 2, sub_package)
-    #for data_type in ar_package.getImplementationDataTypes():
+    # for data_type in ar_package.getImplementationDataTypes():
     #    show_type(indent + 2, data_type)
-    #for mapping_set in ar_package.getDataTypeMappingSets():
+    # for mapping_set in ar_package.getDataTypeMappingSets():
     #    show_data_type_mapping(indent + 2, mapping_set)
-    #for sw_component in ar_package.getAtomicSwComponents():
+    # for sw_component in ar_package.getAtomicSwComponents():
     #    show_sw_component(indent + 2, sw_component)
-    #for sr_interface in ar_package.getSenderReceiverInterfaces():
+    # for sr_interface in ar_package.getSenderReceiverInterfaces():
     #    show_sender_receiver_interface(indent + 2, sr_interface)
     for cs_interface in ar_package.getClientServerInterfaces():
         show_client_server_interface(indent + 2, cs_interface)
@@ -152,6 +162,7 @@ def _usage():
     print("   -h          : show the help information")
     sys.exit(2)
 
+
 def cli_main():
     try:
         opts, _ = getopt.getopt(sys.argv[1:], "h", ["arxml=", "help"])
@@ -160,7 +171,7 @@ def cli_main():
         print(str(err))  # will print something like "option -a not recognized"
         _usage()
 
-    logging.basicConfig(format='[%(levelname)s] : %(message)s', level = logging.DEBUG)
+    logging.basicConfig(format='[%(levelname)s] : %(message)s', level=logging.DEBUG)
     
     arxml_files = []
     for o, arg in opts:
@@ -180,7 +191,7 @@ def cli_main():
     for arxml_file in arxml_files:
         parser.load(arxml_file, document)
 
-    #obj = AUTOSAR.getInstance().find("/AUTOSAR_Platform/ImplementationDataTypes/uint8")
-    #print(obj)
+    # obj = AUTOSAR.getInstance().find("/AUTOSAR_Platform/ImplementationDataTypes/uint8")
+    # print(obj)
     for pkg in document.getARPackages():
-        show_ar_package(0, pkg)
+        show_ar_package(0, pkg)

armodel/cli/arxml_format_cli.py

@@ -4,10 +4,12 @@ import logging
 import sys
 import os.path
 
+from ..transformer.admin_data import AdminDataTransformer
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..parser.arxml_parser import ARXMLParser
 from ..writer import ARXMLWriter
 
+
 def perform_format(args):
     logger = logging.getLogger()
     
@@ -22,20 +24,21 @@ def perform_format(args):
     if os.path.exists(log_file):
         os.remove(log_file)
 
-    file_handler = logging.FileHandler(log_file)
-    file_handler.setFormatter(formatter)
+    if args.verbose:
+        file_handler = logging.FileHandler(log_file)
+        file_handler.setFormatter(formatter)
+        file_handler.setLevel(logging.DEBUG)
 
     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)    
+    if args.verbose:
+        logger.addHandler(file_handler)
+    logger.addHandler(stdout_handler)
 
     try:
         options = {}
@@ -46,26 +49,35 @@ def perform_format(args):
         parser = ARXMLParser(options)
         parser.load(args.INPUT, document)
 
+        if args.remove_admin_data:
+            transform = AdminDataTransformer()
+            transform.remove(document)
+
         writer = ARXMLWriter()
         writer.save(args.OUTPUT, document)
         
     except Exception as e:
-        #print(e)
+        # print(e)
         logger.error(e)
-        raise e
+        if args.verbose:
+            raise e
+
 
 def main():
     version = pkg_resources.require("armodel")[0].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")
-    ap.add_argument("INPUT", help = "The path of AUTOSAR ARXML file")
-    ap.add_argument("OUTPUT", help = "The path of output ARXML file")
+    ap.description = "arxml-format ver: %s" % version
+    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")
+    ap.add_argument("--remove-admin-data", required=False, help="Remove all the AdminData", action="store_true")
+    ap.add_argument("INPUT", help="The path of AUTOSAR ARXML file")
+    ap.add_argument("OUTPUT", help="The path of output ARXML file")
 
     args = ap.parse_args()
 
     perform_format(args)
 
+
 if __name__ == "__main__":
-    main()
+    main()

armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py

@@ -11,9 +11,11 @@ from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject imp
 from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import 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 CompositionSwComponentType
 from ...M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ...M2.AUTOSARTemplates.SystemTemplate import RootSwCompositionPrototype, System
 
+
 class FileInfoComment(ARObject):
     def __init__(self):
         super().__init__()
@@ -27,34 +29,23 @@ class FileInfoComment(ARObject):
         self.sdgs = value
         return self
 
+
 class AbstractAUTOSAR(CollectableElement):
     def __init__(self):
         super().__init__()
 
-        CollectableElement.__init__(self)
-
-        self.schema_location = ""
-        self._appl_impl_type_maps = {}
-        self._impl_appl_type_maps = {}
-
-        self._behavior_impl_maps = {}                       # type: Dict[str, str]
-        self._impl_behavior_maps = {}                       # type: Dict[str, str]
-
-        self.systems = {}                                   # type: Dict[str, System]
-
-        self.rootSwCompositionPrototype = None              # type: RootSwCompositionPrototype
-
-        self.adminData = None                               # type: AdminData
-        self.arPackages = {}                                # type: Dict[str, ARPackage]
-        self.fileInfoComment = None                         # type: FileInfoComment
-        self.introduction = None                            # type: DocumentationBlock
+        self.clear()
 
     def getAdminData(self):
         return self.adminData
 
     def setAdminData(self, value):
-        self.adminData = value
+        if value is not None:
+            self.adminData = value
         return self
+    
+    def removeAdminData(self):
+        self.adminData = None
 
     def getFileInfoComment(self):
         return self.fileInfoComment
@@ -78,8 +69,26 @@ class AbstractAUTOSAR(CollectableElement):
         return ""
 
     def clear(self):
-        self.arPackages = {}
-        self.elements = {}
+        CollectableElement.__init__(self)
+
+        self.schema_location = None
+        self._appl_impl_type_maps = {}
+        self._impl_appl_type_maps = {}
+
+        self._behavior_impl_maps = {}                       # type: Dict[str, str]
+        self._impl_behavior_maps = {}                       # type: Dict[str, str]
+
+        self.uuid_objects = {}                              # type: Dict[str, ARObject]
+
+        self.systems = {}                                   # type: Dict[str, System]
+        self.compositionSwComponentTypes = {}               # type: Dict[str, CompositionSwComponentType]
+
+        self.rootSwCompositionPrototype = None              # type: RootSwCompositionPrototype
+
+        self.adminData = None                               # type: AdminData
+        self.arPackages = {}                                # type: Dict[str, ARPackage]
+        self.fileInfoComment = None                         # type: FileInfoComment
+        self.introduction = None                            # type: DocumentationBlock
 
     def getElement(self, short_name: str) -> Referrable:
         if (short_name in self.arPackages):
@@ -87,8 +96,8 @@ class AbstractAUTOSAR(CollectableElement):
         return CollectableElement.getElement(self, short_name)
 
     def getARPackages(self) -> List[ARPackage]:
-        #return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
-        return list(sorted(self.arPackages.values(), key= lambda a: a.short_name))
+        # return list(filter(lambda e: isinstance(e, ARPackage), self.elements.values()))
+        return list(sorted(self.arPackages.values(), key=lambda a: a.short_name))
 
     def createARPackage(self, short_name: str) -> ARPackage:
         if (short_name not in self.arPackages):
@@ -103,7 +112,7 @@ class AbstractAUTOSAR(CollectableElement):
             if (short_name == ""):
                 continue
             element = element.getElement(short_name)
-            if (element == None):
+            if (element is None):
                 return element
             #    raise ValueError("The %s of reference <%s> does not exist." % (short_name, referred_name))
         return element
@@ -156,24 +165,49 @@ class AbstractAUTOSAR(CollectableElement):
             return self.find(self._impl_behavior_maps[impl_ref])
         return None
 
-    def getImplementation(self, behavior_ref:str):
+    def getImplementation(self, behavior_ref: str):
         if behavior_ref in self._behavior_impl_maps:
             return self.find(self._behavior_impl_maps[behavior_ref])
         return None
     
     def addSystem(self, system: System):
         short_name = system.getShortName()
-        if  short_name not in self.systems:
+        if short_name not in self.systems:
             self.systems[short_name] = system
     
     def getSystems(self) -> List[System]:
-        return list(sorted(self.systems.values(), key = lambda a: a.getShortName()))
-class AUTOSAR (AbstractAUTOSAR):        
+        return list(sorted(self.systems.values(), key=lambda a: a.getShortName()))
+    
+    def getCompositionSwComponentTypes(self):
+        return self.compositionSwComponentTypes
+    
+    def getCompositionSwComponentType(self, short_name: str):
+        return self.compositionSwComponentTypes[short_name]
+
+    def addCompositionSwComponentType(self, sw_component_type: CompositionSwComponentType):
+        if sw_component_type is not None:
+            short_name = sw_component_type.getShortName()
+            if short_name not in self.compositionSwComponentTypes:
+                self.compositionSwComponentTypes[short_name] = sw_component_type
+        return self
+    
+    def getARObjectByUUID(self, uuid: str):
+        if uuid in self.uuid_objects:
+            return self.uuid_objects[uuid]
+        return None
+
+    def addARObject(self, value: ARObject):
+        if value is not None:
+            self.uuid_objects[value.uuid] = value
+        return self
+
+
+class AUTOSAR (AbstractAUTOSAR):
     __instance = None
 
     @staticmethod
     def getInstance():
-        if (AUTOSAR.__instance == None):
+        if (AUTOSAR.__instance is None):
             AUTOSAR()
         return AUTOSAR.__instance
     
@@ -181,13 +215,14 @@ class AUTOSAR (AbstractAUTOSAR):
         self.clear()
 
     def __init__(self):
-        if (AUTOSAR.__instance != None):
+        if (AUTOSAR.__instance is not None):
             raise Exception("The AUTOSAR is singleton!")
         
         AUTOSAR.__instance = self
 
         super().__init__()
 
+
 class AUTOSARDoc(AbstractAUTOSAR):
     def __init__(self):
         super().__init__()