Skip to content

Commit 7e53d20

Browse files
brubbelbrubbel
committed
Node.server -> isession -> session_server
1 parent 63e97ae commit 7e53d20

9 files changed

+92
-94
lines changed

‎opcua/common/copy_node.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ def copy_node(parent, node, nodeid=None, recursive=True):
1515

1616
if nodeid is None:
1717
nodeid = ua.NodeId(namespaceidx=node.nodeid.NamespaceIndex)
18-
added_nodeids = _copy_node(parent.isession, parent.nodeid, rdesc, nodeid, recursive)
19-
return [Node(parent.isession, nid) for nid in added_nodeids]
18+
added_nodeids = _copy_node(parent.session_server, parent.nodeid, rdesc, nodeid, recursive)
19+
return [Node(parent.session_server, nid) for nid in added_nodeids]
2020

2121

22-
def _copy_node(isession, parent_nodeid, rdesc, nodeid, recursive):
22+
def _copy_node(session_server, parent_nodeid, rdesc, nodeid, recursive):
2323
addnode = ua.AddNodesItem()
2424
addnode.RequestedNewNodeId = nodeid
2525
addnode.BrowseName = rdesc.BrowseName
@@ -28,19 +28,19 @@ def _copy_node(isession, parent_nodeid, rdesc, nodeid, recursive):
2828
addnode.TypeDefinition = rdesc.TypeDefinition
2929
addnode.NodeClass = rdesc.NodeClass
3030

31-
node_to_copy = Node(isession, rdesc.NodeId)
31+
node_to_copy = Node(session_server, rdesc.NodeId)
3232

3333
attrObj = getattr(ua, rdesc.NodeClass.name + "Attributes")
3434
_read_and_copy_attrs(node_to_copy, attrObj(), addnode)
3535

36-
res = isession.add_nodes([addnode])[0]
36+
res = session_server.add_nodes([addnode])[0]
3737

3838
added_nodes = [res.AddedNodeId]
3939

4040
if recursive:
4141
descs = node_to_copy.get_children_descriptions()
4242
for desc in descs:
43-
nodes = _copy_node(isession, res.AddedNodeId, desc, nodeid=ua.NodeId(namespaceidx=desc.NodeId.NamespaceIndex), recursive=True)
43+
nodes = _copy_node(session_server, res.AddedNodeId, desc, nodeid=ua.NodeId(namespaceidx=desc.NodeId.NamespaceIndex), recursive=True)
4444
added_nodes.extend(nodes)
4545

4646
return added_nodes

‎opcua/common/instantiate.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ def instantiate(parent, node_type, nodeid=None, bname=None, dname=None, idx=0, i
3030
bname = ua.QualifiedName.from_string(bname)
3131

3232
nodeids = _instantiate_node(
33-
parent.isession,
34-
Node(parent.isession, rdesc.NodeId),
33+
parent.session_server,
34+
Node(parent.session_server, rdesc.NodeId),
3535
parent.nodeid,
3636
rdesc,
3737
nodeid,
3838
bname,
3939
dname=dname,
4040
instantiate_optional=instantiate_optional)
41-
return [Node(parent.isession, nid) for nid in nodeids]
41+
return [Node(parent.session_server, nid) for nid in nodeids]
4242

4343

44-
def _instantiate_node(isession,
44+
def _instantiate_node(session_server,
4545
node_type,
4646
parentid,
4747
rdesc,
@@ -80,19 +80,19 @@ def _instantiate_node(isession,
8080
if dname is not None:
8181
addnode.NodeAttributes.DisplayName = dname
8282

83-
res = isession.add_nodes([addnode])[0]
83+
res = session_server.add_nodes([addnode])[0]
8484
added_nodes = [res.AddedNodeId]
8585

8686
if recursive:
8787
parents = ua_utils.get_node_supertypes(node_type, includeitself=True)
88-
node = Node(isession, res.AddedNodeId)
88+
node = Node(session_server, res.AddedNodeId)
8989
for parent in parents:
9090
descs = parent.get_children_descriptions(includesubtypes=False)
9191
for c_rdesc in descs:
9292
# skip items that already exists, prefer the 'lowest' one in object hierarchy
9393
if not ua_utils.is_child_present(node, c_rdesc.BrowseName):
9494

95-
c_node_type = Node(isession, c_rdesc.NodeId)
95+
c_node_type = Node(session_server, c_rdesc.NodeId)
9696
refs = c_node_type.get_referenced_nodes(refs=ua.ObjectIds.HasModellingRule)
9797
if not refs:
9898
# spec says to ignore nodes without modelling rules
@@ -107,15 +107,15 @@ def _instantiate_node(isession,
107107
if res.AddedNodeId.NodeIdType is ua.NodeIdType.String:
108108
inst_nodeid = res.AddedNodeId.Identifier + "." + c_rdesc.BrowseName.Name
109109
nodeids = _instantiate_node(
110-
isession,
110+
session_server,
111111
c_node_type,
112112
res.AddedNodeId,
113113
c_rdesc,
114114
nodeid=ua.NodeId(identifier=inst_nodeid, namespaceidx=res.AddedNodeId.NamespaceIndex),
115115
bname=c_rdesc.BrowseName)
116116
else:
117117
nodeids = _instantiate_node(
118-
isession,
118+
session_server,
119119
c_node_type,
120120
res.AddedNodeId,
121121
c_rdesc,

‎opcua/common/manage_nodes.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def create_folder(parent, nodeid, bname):
3838
or namespace index, name
3939
"""
4040
nodeid, qname = _parse_nodeid_qname(nodeid, bname)
41-
return node.Node(parent.isession, _create_object(parent.isession, parent.nodeid, nodeid, qname, ua.ObjectIds.FolderType))
41+
return node.Node(parent.session_server, _create_object(parent.session_server, parent.nodeid, nodeid, qname, ua.ObjectIds.FolderType))
4242

4343

4444
def create_object(parent, nodeid, bname, objecttype=None):
@@ -50,12 +50,12 @@ def create_object(parent, nodeid, bname, objecttype=None):
5050
"""
5151
nodeid, qname = _parse_nodeid_qname(nodeid, bname)
5252
if objecttype is not None:
53-
objecttype = node.Node(parent.isession, objecttype)
53+
objecttype = node.Node(parent.session_server, objecttype)
5454
dname = ua.LocalizedText(bname)
5555
nodes = instantiate(parent, objecttype, nodeid, bname=qname, dname=dname)[0]
5656
return nodes
5757
else:
58-
return node.Node(parent.isession, _create_object(parent.isession, parent.nodeid, nodeid, qname, ua.ObjectIds.BaseObjectType))
58+
return node.Node(parent.session_server, _create_object(parent.session_server, parent.nodeid, nodeid, qname, ua.ObjectIds.BaseObjectType))
5959

6060

6161
def create_property(parent, nodeid, bname, val, varianttype=None, datatype=None):
@@ -70,7 +70,7 @@ def create_property(parent, nodeid, bname, val, varianttype=None, datatype=None)
7070
datatype = ua.NodeId(datatype, 0)
7171
if datatype and not isinstance(datatype, ua.NodeId):
7272
raise RuntimeError("datatype argument must be a nodeid or an int refering to a nodeid")
73-
return node.Node(parent.isession, _create_variable(parent.isession, parent.nodeid, nodeid, qname, var, datatype=datatype, isproperty=True))
73+
return node.Node(parent.session_server, _create_variable(parent.session_server, parent.nodeid, nodeid, qname, var, datatype=datatype, isproperty=True))
7474

7575

7676
def create_variable(parent, nodeid, bname, val, varianttype=None, datatype=None):
@@ -86,7 +86,7 @@ def create_variable(parent, nodeid, bname, val, varianttype=None, datatype=None)
8686
if datatype and not isinstance(datatype, ua.NodeId):
8787
raise RuntimeError("datatype argument must be a nodeid or an int refering to a nodeid")
8888

89-
return node.Node(parent.isession, _create_variable(parent.isession, parent.nodeid, nodeid, qname, var, datatype=datatype, isproperty=False))
89+
return node.Node(parent.session_server, _create_variable(parent.session_server, parent.nodeid, nodeid, qname, var, datatype=datatype, isproperty=False))
9090

9191

9292
def create_variable_type(parent, nodeid, bname, datatype):
@@ -100,7 +100,7 @@ def create_variable_type(parent, nodeid, bname, datatype):
100100
datatype = ua.NodeId(datatype, 0)
101101
if datatype and not isinstance(datatype, ua.NodeId):
102102
raise RuntimeError("Data type argument must be a nodeid or an int refering to a nodeid, received: {}".format(datatype))
103-
return node.Node(parent.isession, _create_variable_type(parent.isession, parent.nodeid, nodeid, qname, datatype))
103+
return node.Node(parent.session_server, _create_variable_type(parent.session_server, parent.nodeid, nodeid, qname, datatype))
104104

105105

106106
def create_reference_type(parent, nodeid, bname, symmetric=True, inversename=None):
@@ -110,7 +110,7 @@ def create_reference_type(parent, nodeid, bname, symmetric=True, inversename=Non
110110
or idx and name
111111
"""
112112
nodeid, qname = _parse_nodeid_qname(nodeid, bname)
113-
return node.Node(parent.isession, _create_reference_type(parent.isession, parent.nodeid, nodeid, qname, symmetric, inversename))
113+
return node.Node(parent.session_server, _create_reference_type(parent.session_server, parent.nodeid, nodeid, qname, symmetric, inversename))
114114

115115

116116
def create_object_type(parent, nodeid, bname):
@@ -120,7 +120,7 @@ def create_object_type(parent, nodeid, bname):
120120
or namespace index, name
121121
"""
122122
nodeid, qname = _parse_nodeid_qname(nodeid, bname)
123-
return node.Node(parent.isession, _create_object_type(parent.isession, parent.nodeid, nodeid, qname))
123+
return node.Node(parent.session_server, _create_object_type(parent.session_server, parent.nodeid, nodeid, qname))
124124

125125

126126
def create_method(parent, *args):
@@ -142,7 +142,7 @@ def create_method(parent, *args):
142142
outputs = args[4]
143143
else:
144144
outputs = []
145-
return node.Node(parent.isession, _create_method(parent, nodeid, qname, callback, inputs, outputs))
145+
return node.Node(parent.session_server, _create_method(parent, nodeid, qname, callback, inputs, outputs))
146146

147147

148148
def _create_object(server, parentnodeid, nodeid, qname, objecttype):
@@ -302,9 +302,9 @@ def create_data_type(parent, nodeid, bname, description=None):
302302
attrs.UserWriteMask = 0
303303
attrs.IsAbstract = False # True mean they cannot be instanciated
304304
addnode.NodeAttributes = attrs
305-
results = parent.isession.add_nodes([addnode])
305+
results = parent.session_server.add_nodes([addnode])
306306
results[0].StatusCode.check()
307-
return node.Node(parent.isession, results[0].AddedNodeId)
307+
return node.Node(parent.session_server, results[0].AddedNodeId)
308308

309309

310310
def _create_method(parent, nodeid, qname, callback, inputs, outputs):
@@ -323,9 +323,9 @@ def _create_method(parent, nodeid, qname, callback, inputs, outputs):
323323
attrs.Executable = True
324324
attrs.UserExecutable = True
325325
addnode.NodeAttributes = attrs
326-
results = parent.isession.add_nodes([addnode])
326+
results = parent.session_server.add_nodes([addnode])
327327
results[0].StatusCode.check()
328-
method = node.Node(parent.isession, results[0].AddedNodeId)
328+
method = node.Node(parent.session_server, results[0].AddedNodeId)
329329
if inputs:
330330
create_property(method,
331331
ua.NodeId(namespaceidx=method.nodeid.NamespaceIndex),
@@ -340,8 +340,8 @@ def _create_method(parent, nodeid, qname, callback, inputs, outputs):
340340
[_vtype_to_argument(vtype) for vtype in outputs],
341341
varianttype=ua.VariantType.ExtensionObject,
342342
datatype=ua.ObjectIds.Argument)
343-
if hasattr(parent.isession, "add_method_callback"):
344-
parent.isession.add_method_callback(method.nodeid, callback)
343+
if hasattr(parent.session_server, "add_method_callback"):
344+
parent.session_server.add_method_callback(method.nodeid, callback)
345345
return results[0].AddedNodeId
346346

347347

‎opcua/common/methods.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ def call_method_full(parent, methodid, *args):
3737
elif isinstance(methodid, node.Node):
3838
methodid = methodid.nodeid
3939

40-
result = _call_method(parent.isession, parent.nodeid, methodid, to_variant(*args))
40+
result = _call_method(parent.session_server, parent.nodeid, methodid, to_variant(*args))
4141
result.OutputArguments = [var.Value for var in result.OutputArguments]
4242
return result
4343

4444

45-
def _call_method(isession, parentnodeid, methodid, arguments):
45+
def _call_method(session_server, parentnodeid, methodid, arguments):
4646
request = ua.CallMethodRequest()
4747
request.ObjectId = parentnodeid
4848
request.MethodId = methodid
4949
request.InputArguments = arguments
5050
methodstocall = [request]
51-
results = isession.call(methodstocall)
51+
results = session_server.call(methodstocall)
5252
res = results[0]
5353
res.StatusCode.check()
5454
return res

0 commit comments

Comments
 (0)