armodel 1.6.3__py3-none-any.whl → 1.7.0__py3-none-any.whl

armodel/models/M2/MSR/AsamHdo/Constraints/GlobalConstraints.py

@@ -1,8 +1,7 @@
 from typing import List
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, Limit, RefType
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, Limit, RefType
 
 class InternalConstrs(ARObject):
     def __init__(self):

armodel/models/M2/MSR/AsamHdo/Constraints/__init__.py

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

armodel/models/M2/MSR/AsamHdo/SpecialData.py

@@ -1,9 +1,6 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
-
 class Sd(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/M2/MSR/AsamHdo/Units.py

@@ -1,9 +1,6 @@
-
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType, ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 
 class PhysicalDimension(ARElement):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/M2/MSR/AsamHdo/__init__.py

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

armodel/models/M2/MSR/CalibrationData/CalibrationValue.py

@@ -1,11 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
-
-
 from typing import List
-
-from armodel.models.M2.MSR.DataDictionary.DataDefProperties import ValueList
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
+from ....M2.MSR.DataDictionary.DataDefProperties import ValueList
 
 class SwValues(ARObject):
     def __init__(self):

armodel/models/M2/MSR/CalibrationData/__init__.py

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

armodel/models/M2/MSR/DataDictionary/AuxillaryObjects.py

@@ -1,10 +1,7 @@
-
 from typing import List
-
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class SwAddrMethod(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/M2/MSR/DataDictionary/Axis.py

@@ -1,7 +1,7 @@
-from .CalibrationParameter import SwCalprmAxisTypeProps
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType
 from typing import List
+from ....M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisTypeProps
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType
 
 class SwGenericAxisParam(ARObject):
     def __init__(self):

armodel/models/M2/MSR/DataDictionary/CalibrationParameter.py

@@ -1,8 +1,8 @@
 from typing import List
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
-
 from abc import ABCMeta
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
+
 class SwCalprmAxisTypeProps(ARObject, metaclass = ABCMeta):
     def __init__(self):
         if type(self) == SwCalprmAxisTypeProps:

armodel/models/M2/MSR/DataDictionary/DataDefProperties.py

@@ -1,10 +1,9 @@
 from typing import List
-
-from ...MSR.Documentation import Annotation
-from ...MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
-from ...AUTOSARTemplates.CommonStructure import ValueSpecification
+from ....M2.MSR.Documentation.Annotation import Annotation
+from ....M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
+from ....M2.AUTOSARTemplates.CommonStructure import ValueSpecification
 
 class SwDataDefPropsConditional(ARObject):
     '''

armodel/models/M2/MSR/DataDictionary/RecordLayout.py

@@ -1,7 +1,7 @@
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
-from ...MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 
 class SwRecordLayoutV(ARObject):
     def __init__(self):

armodel/models/M2/MSR/DataDictionary/__init__.py

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

armodel/models/M2/MSR/Documentation/Annotation.py

@@ -1,11 +1,9 @@
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from .BlockElements import DocumentationBlock
-from armodel.models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
-
+from ....M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
 from abc import ABCMeta
 
-
 class GeneralAnnotation(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == ARObject:

armodel/models/M2/MSR/Documentation/BlockElements.py

@@ -1,6 +1,6 @@
 from typing import List
-from .TextModel.MultilanguageData import MultiLanguageParagraph
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class DocumentationBlock(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py

@@ -1,5 +1,4 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class LOverviewParagraph(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py

@@ -1,10 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
-from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
-
-
 from typing import List
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
 
 class MultiLanguageParagraph(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/__init__.py

@@ -1,2 +0,0 @@
-from .LanguageDataModel import *
-from .MultilanguageData import *

armodel/models/M2/MSR/Documentation/__init__.py

@@ -1,3 +1,3 @@
 from .Annotation import *
 from .BlockElements import *
-from .TextModel import *
+from .TextModel import *

armodel/models/M2/MSR/__init__.py

@@ -1 +1 @@
-from . import *
+ 

armodel/models/M2/__init__.py

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

armodel/models/__init__.py

@@ -1,7 +1,61 @@
-from .sw_component import *
+from .M2.MSR.AsamHdo import *
+from .M2.MSR.AsamHdo.AdminData import *
+from .M2.MSR.AsamHdo.BaseTypes import *
+from .M2.MSR.AsamHdo.ComputationMethod import *
+from .M2.MSR.AsamHdo.SpecialData import *
+from .M2.MSR.AsamHdo.Units import *
+from .M2.MSR.AsamHdo.Constraints.GlobalConstraints import *
 from .M2.MSR.DataDictionary import *
 from .M2.MSR.Documentation import *
-from .M2.MSR.AsamHdo import *
+from .M2.MSR.Documentation.Annotation import *
+from .M2.MSR.Documentation.BlockElements import *
+from .M2.MSR.Documentation.TextModel import *
+from .M2.MSR.Documentation.TextModel.LanguageDataModel import *
+from .M2.MSR.Documentation.TextModel.MultilanguageData import *
 from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
+from .M2.AUTOSARTemplates.BswModuleTemplate import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
-from .M2.AUTOSARTemplates.SWComponentTemplate import *
+from .M2.AUTOSARTemplates.CommonStructure.Filter import *
+from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
+from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
+from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
+from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
+from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
+from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
+from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
+from .M2.AUTOSARTemplates.SWComponentTemplate import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Communication import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Components import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Composition import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
+from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
+from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
+from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import *

armodel/parser/abstract_arxml_parser.py

@@ -9,7 +9,7 @@ import xml.etree.ElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, Integer, TimeValue
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
@@ -73,7 +73,7 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementLiteral(self, short_name: str, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
@@ -82,7 +82,7 @@ class AbstractARXMLParser:
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
         
     def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             literal = ARLiteral()
@@ -91,10 +91,27 @@ class AbstractARXMLParser:
         return results
 
     def getChildElementOptionalLiteral(self, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("readChildOptionalElementLiteral : %s" % child_element.text)
+            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            literal = ARLiteral()
+            self.readElementAttributes(child_element, literal)
+            # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
+            if child_element.text is None:      
+                literal.setValue("")
+            else:
+                literal.setValue(child_element.text)
+        return literal
+    
+    def getChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str) -> ARLiteral:
+        child_element = self.find(element, key)
+        literal = None
+        if (child_element is not None) and (child_element.text is not None):
+            self.logger.debug("getChildElementOptionalRevisionLabelString : %s" % child_element.text)
+            m = re.match(r'[0-9]+\.[0-9]+\.[0-9]+([\._;].*)?', child_element.text)
+            if not m:
+                raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
@@ -110,7 +127,7 @@ class AbstractARXMLParser:
         return False
     
     def getChildElementOptionalFloatValue(self, element: ET.Element, key: str) -> ARFloat:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
@@ -118,26 +135,34 @@ class AbstractARXMLParser:
         return float_value
     
     def getChildElementFloatValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             float_value = ARFloat()
             float_value.setValue(child_element.text)
             results.append(float_value)
         return results
+    
+    def getChildElementOptionalTimeValue(self, element: ET.Element, key: str) -> TimeValue:
+        child_element = self.find(element, key)
+        time_value = None
+        if (child_element is not None) and (child_element.text is not None):
+            time_value = TimeValue()
+            time_value.setValue(child_element.text)
+        return time_value
 
-    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementLiteral(short_name, element, key)
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.value = self._convertStringToBooleanValue(literal._value)
         return bool_value
 
-    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
         if (literal == None):
             return None
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.setValue(literal.getValue())
         return bool_value
@@ -162,16 +187,25 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if child_element == None:
             return None
         numerical = ARNumerical()
         self.readElementAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
         return numerical
+    
+    def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
+        child_element = self.find(element, key)
+        if child_element == None:
+            return None
+        numerical = Integer()
+        self.readElementAttributes(child_element, numerical)
+        numerical.setValue(child_element.text)
+        return numerical
         
     def getChildElementNumericalValueList(self, element: ET.Element, key: str) -> List[ARNumerical]:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             numerical = ARNumerical()
@@ -180,7 +214,7 @@ class AbstractARXMLParser:
         return results
     
     def getChildLimitElement(self, element: ET.Element, key: str) -> Limit:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             limit = Limit()
             self.readElementAttributes(child_element, limit)
@@ -199,13 +233,13 @@ class AbstractARXMLParser:
         return ref
 
     def getChildElementRefType(self, short_name: str, element: ET.Element, key: str) -> RefType:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
 
     def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         return None