better default display name when instantiating node, logging fix

Author: oroulet

opcua/common/copy_node.py

@@ -1,12 +1,16 @@
+import logging
+
 from opcua import ua
 from opcua.common.node import Node
 
 
+logger = logging.getLogger(__name__)
+
+
 def copy_node(parent, node, nodeid=None, recursive=True):
     """
     Copy a node or node tree as child of parent node
     """
-    print("Copying", node, "into ", parent)
     rdesc = _rdesc_from_node(parent, node)
 
     if nodeid is None:
@@ -73,5 +77,5 @@ def _read_and_copy_attrs(node_type, struct, addnode):
             else:
                 setattr(struct, name, results[idx].Value.Value)
         else:
-            print("Instantiate: while copying attributes from node type {0!s}, attribute {1!s}, statuscode is {2!s}".format(node_type, name, results[idx].StatusCode))            
+            logger.warning("Instantiate: while copying attributes from node type {0!s}, attribute {1!s}, statuscode is {2!s}".format(node_type, name, results[idx].StatusCode))            
     addnode.NodeAttributes = struct

opcua/common/instantiate.py

@@ -2,14 +2,19 @@
 Instantiate a new node and its child nodes from a node type.
 """
 
+import logging
+
 
 from opcua import Node
 from opcua import ua
 from opcua.common import ua_utils
 from opcua.common.copy_node import _rdesc_from_node, _read_and_copy_attrs
 
 
-def instantiate(parent, node_type, nodeid=None, bname=None, idx=0):
+logger = logging.getLogger(__name__)
+
+
+def instantiate(parent, node_type, nodeid=None, bname=None, dname=None, idx=0):
     """
     instantiate a node type under a parent node.
     nodeid and browse name of new node can be specified, or just namespace index
@@ -26,11 +31,11 @@ def instantiate(parent, node_type, nodeid=None, bname=None, idx=0):
     elif isinstance(bname, str):
         bname = ua.QualifiedName.from_string(bname)
 
-    nodeids = _instantiate_node(parent.server, parent.nodeid, rdesc, nodeid, bname)
+    nodeids = _instantiate_node(parent.server, parent.nodeid, rdesc, nodeid, bname, dname=dname)
     return [Node(parent.server, nid) for nid in nodeids]
 
 
-def _instantiate_node(server, parentid, rdesc, nodeid, bname, recursive=True):
+def _instantiate_node(server, parentid, rdesc, nodeid, bname, dname=None, recursive=True):
     """
     instantiate a node type under parent
     """
@@ -59,8 +64,10 @@ def _instantiate_node(server, parentid, rdesc, nodeid, bname, recursive=True):
         addnode.NodeClass = ua.NodeClass.Method
         _read_and_copy_attrs(node_type, ua.MethodAttributes(), addnode)
     else:
-        print("Instantiate: Node class not supported: ", rdesc.NodeClass)
+        logger.warning("Instantiate: Node class not supported: %s", rdesc.NodeClass)
         return
+    if dname is not None:
+        addnode.NodeAttributes.DisplayName = dname
 
     res = server.add_nodes([addnode])[0]
     added_nodes = [res.AddedNodeId]

opcua/common/manage_nodes.py

@@ -51,7 +51,8 @@ def create_object(parent, nodeid, bname, objecttype=None):
     nodeid, qname = _parse_nodeid_qname(nodeid, bname)
     if objecttype is not None:
         objecttype = node.Node(parent.server, objecttype)
-        nodes = instantiate(parent, objecttype, nodeid, bname)[0]
+        dname = ua.LocalizedText(bname)
+        nodes = instantiate(parent, objecttype, nodeid, bname=qname, dname=dname)[0]
         return nodes
     else:
         return node.Node(parent.server, _create_object(parent.server, parent.nodeid, nodeid, qname, ua.ObjectIds.BaseObjectType))