while importing xml, check for parents in all nodes in caseit is not declared locally

asyncua/common/shortcuts.py

@@ -27,3 +27,6 @@ class Shortcuts(object):
         self.opc_binary = Node(server, ObjectIds.OPCBinarySchema_TypeSystem)
         self.base_structure_type = Node(server, ObjectIds.Structure)
         self.server_state = Node(server, ObjectIds.Server_ServerStatus_State)
+        self.HasComponent = Node(server, ObjectIds.HasComponent)
+        self.HasProperty = Node(server, ObjectIds.HasProperty)
+        self.Organizes = Node(server, ObjectIds.Organizes)

asyncua/common/xmlimporter.py

@@ -52,10 +52,12 @@ class XmlImporter:
         self.parser = XMLParser()
         await self.parser.parse(xmlpath, xmlstring)
         self.namespaces = await self._map_namespaces(self.parser.get_used_namespaces())
+        _logger.info("namespace map: %s", self.namespaces)
         self.aliases = self._map_aliases(self.parser.get_aliases())
         self.refs = []
         dnodes = self.parser.get_node_datas()
         dnodes = self.make_objects(dnodes)
+        self._add_missing_parents(dnodes)
         nodes_parsed = self._sort_nodes_by_parentid(dnodes)
         nodes = []
         for nodedata in nodes_parsed:  # self.parser:
@@ -71,6 +73,27 @@ class XmlImporter:
             _logger.warning("The following references could not be imported and are probably broken: %s", self.refs)
         return nodes
 
+    def _add_missing_parents(self, dnodes):
+        missing = []
+        childs = {}
+        for nd in dnodes:
+            if not nd.parent or nd.parent == nd.nodeid:
+                missing.append(nd)
+            for ref in nd.refs:
+                if ref.forward:
+                    if ref.reftype in [self.server.nodes.HasComponent.nodeid, self.server.nodes.HasProperty.nodeid, self.server.nodes.Organizes.nodeid]:
+                        # if a node has several links, the last one will win
+                        if ref.target in childs:
+                            _logger.warning("overwriting parent target, shouldbe fixed", ref.target, nd.nodeid, ref.reftype, childs[ref.target])
+                        childs[ref.target] = (nd.nodeid, ref.reftype)
+        for nd in missing:
+            if nd.nodeid in childs:
+                target, reftype = childs[nd.nodeid]
+                nd.parent = target
+                nd.parentlink = reftype
+                from IPython import embed
+                embed()
+
     async def _add_node_data(self, nodedata) -> "Node":
         if nodedata.nodetype == "UAObject":
             node = await self.add_object(nodedata)

asyncua/common/xmlparser.py

@@ -174,7 +174,7 @@ class XMLParser:
         obj.nodetype = nodetype
         for key, val in child.attrib.items():
             self._set_attr(key, val, obj)
-        self.logger.info("Parsing node: %s %s", obj.nodeid, obj.browsename)
+        self.logger.debug("Parsing node: %s %s", obj.nodeid, obj.browsename)
         obj.displayname = obj.browsename  # give a default value to display name
         for el in child:
             self._parse_attr(el, obj)