opcua/common/xmlimporter.py

@@ -144,9 +144,8 @@ def _get_node(self, obj):
         node.BrowseName = self._migrate_ns(obj.browsename)
         self.logger.info("Importing xml node (%s, %s) as (%s %s)", obj.browsename, obj.nodeid, node.BrowseName, node.RequestedNewNodeId)
         node.NodeClass = getattr(ua.NodeClass, obj.nodetype[2:])
-        if obj.parent:
+        if obj.parent and obj.parentlink:
             node.ParentNodeId = self._migrate_ns(obj.parent)
-        if obj.parentlink:
             node.ReferenceTypeId = self._migrate_ns(obj.parentlink)
         if obj.typedef:
             node.TypeDefinition = self._migrate_ns(obj.typedef)
@@ -395,7 +394,7 @@ def _add_refs(self, obj):
         refs = []
         for data in obj.refs:
             ref = ua.AddReferencesItem()
-            ref.IsForward = True
+            ref.IsForward = data.forward
             ref.ReferenceTypeId = self.to_nodeid(data.reftype)
             ref.SourceNodeId = self._migrate_ns(obj.nodeid)
             ref.TargetNodeClass = ua.NodeClass.DataType

opcua/common/xmlparser.py

@@ -329,17 +329,16 @@ def _parse_body(self, el):
 
     def _parse_refs(self, el, obj):
         for ref in el:
+            struct = RefStruct()
+            struct.forward = "IsForward" not in ref.attrib or ref.attrib["IsForward"] not in ("false", "False")
+            struct.target = ref.text
+            struct.reftype = ref.attrib["ReferenceType"]
+            obj.refs.append(struct)
+
             if ref.attrib["ReferenceType"] == "HasTypeDefinition":
                 obj.typedef = ref.text
-            elif "IsForward" in ref.attrib and ref.attrib["IsForward"] in ("false", "False"):
-                # if obj.parent:
-                    # sys.stderr.write("Parent is already set with: "+ obj.parent + " " + ref.text + "\n")
-                obj.parent = ref.text
-                obj.parentlink = ref.attrib["ReferenceType"]
-            else:
-                struct = RefStruct()
-                if "IsForward" in ref.attrib:
-                    struct.forward = ref.attrib["IsForward"]
-                struct.target = ref.text
-                struct.reftype = ref.attrib["ReferenceType"]
-                obj.refs.append(struct)
+            elif not struct.forward:
+                if not obj.parent:
+                    obj.parent = ref.text
+                if obj.parent == ref.text:
+                    obj.parentlink = ref.attrib["ReferenceType"]

schemas/generate_address_space.py

@@ -90,9 +90,8 @@ def make_node_code(self, obj, indent):
         self.writecode(indent, 'node.RequestedNewNodeId = ua.NodeId.from_string("{0}")'.format(obj.nodeid))
         self.writecode(indent, 'node.BrowseName = ua.QualifiedName.from_string("{0}")'.format(obj.browsename))
         self.writecode(indent, 'node.NodeClass = ua.NodeClass.{0}'.format(obj.nodetype[2:]))
-        if obj.parent:
+        if obj.parent and obj.parentlink:
             self.writecode(indent, 'node.ParentNodeId = ua.NodeId.from_string("{0}")'.format(obj.parent))
-        if obj.parent:
             self.writecode(indent, 'node.ReferenceTypeId = {0}'.format(self.to_ref_type(obj.parentlink)))
         if obj.typedef:
             self.writecode(indent, 'node.TypeDefinition = ua.NodeId.from_string("{0}")'.format(obj.typedef))
@@ -267,7 +266,7 @@ def make_refs_code(self, obj, indent):
         self.writecode(indent, "refs = []")
         for ref in obj.refs:
             self.writecode(indent, 'ref = ua.AddReferencesItem()')
-            self.writecode(indent, 'ref.IsForward = True')
+            self.writecode(indent, 'ref.IsForward = {0}'.format(ref.forward))
             self.writecode(indent, 'ref.ReferenceTypeId = {0}'.format(self.to_ref_type(ref.reftype)))
             self.writecode(indent, 'ref.SourceNodeId = ua.NodeId.from_string("{0}")'.format(obj.nodeid))
             self.writecode(indent, 'ref.TargetNodeClass = ua.NodeClass.DataType')