remove add_subtype and use add_object_type

opcua/common/manage_nodes.py

@@ -141,17 +141,6 @@ def create_method(parent, *args):
     return node.Node(parent.server, _create_method(parent, nodeid, qname, callback, inputs, outputs))
 
 
-# FIXME: remove, it implicitely means create_object_type
-def create_subtype(parent, *args):
-    """
-    create a child node subtype
-    arguments are nodeid, browsename
-    or namespace index, name
-    """
-    nodeid, qname = _parse_nodeid_qname(*args[:2])
-    return node.Node(parent.server, _create_object_type(parent.server, parent.nodeid, nodeid, qname))
-
-
 def _create_object(server, parentnodeid, nodeid, qname, objecttype):
     addnode = ua.AddNodesItem()
     addnode.RequestedNewNodeId = nodeid

opcua/common/node.py

@@ -523,10 +523,6 @@ class Node(object):
         from opcua.common import manage_nodes
         return manage_nodes.create_method(*args, **kwargs)
 
-    def add_subtype(*args, **kwargs):
-        from opcua.common import manage_nodes
-        return manage_nodes.create_subtype(*args, **kwargs)
-
     def call_method(*args, **kwargs):
         from opcua.common import methods
         return methods.call_method(*args, **kwargs)

opcua/server/server.py

@@ -370,7 +370,7 @@ class Server(object):
         else:
             base_t = Node(self.iserver.isession, ua.NodeId(basetype))
 
-        custom_t = base_t.add_subtype(idx, name)
+        custom_t = base_t.add_object_type(idx, name)
         for property in properties:
             datatype = None
             if len(property) > 2:

tests/tests_common.py

@@ -505,7 +505,7 @@ class CommonTests(object):
         self.assertEqual(o.get_type_definition(), ua.ObjectIds.BaseObjectType)
 
         base_otype= self.opc.get_node(ua.ObjectIds.BaseObjectType)
-        custom_otype = base_otype.add_subtype(2, 'MyFooObjectType')
+        custom_otype = base_otype.add_object_type(2, 'MyFooObjectType')
 
         o = f.add_object(3, 'MyObject3', custom_otype.nodeid)
         self.assertEqual(o.get_type_definition(), custom_otype.nodeid.Identifier)