Commit 7fef5d5a authored by yogesh.m's avatar yogesh.m

update

parent 17dc5ad8
...@@ -15,7 +15,7 @@ class asyncua_server(): ...@@ -15,7 +15,7 @@ class asyncua_server():
async def delete_nodes(self,nodes): async def delete_nodes(self,nodes):
for node in nodes: for node in nodes:
node = "ns=3;i=" + node if node.isdigit() else "ns=3;s=" + node node = "ns="+self.remote_server_idx+";i=" + node if node.isdigit() else "ns="+self.remote_server_idx+";s=" + node
node = self.server.get_node(node) node = self.server.get_node(node)
await self.server.delete_nodes([node]) await self.server.delete_nodes([node])
...@@ -41,9 +41,9 @@ class asyncua_server(): ...@@ -41,9 +41,9 @@ class asyncua_server():
async def update_variable(self,node,datatype): async def update_variable(self,node,datatype):
if (node.isdigit()): if (node.isdigit()):
node_index = "ns=3;i=" + node node_index = "ns="+self.remote_server_idx+";i=" + node
else: else:
node_index = "ns=3;s=" + node node_index = "ns="+self.remote_server_idx+";s=" + node
parent_node= self.server.get_node(self.variables[node]["parent"]) parent_node= self.server.get_node(self.variables[node]["parent"])
datatype = int(datatype) datatype = int(datatype)
...@@ -70,17 +70,17 @@ class asyncua_server(): ...@@ -70,17 +70,17 @@ class asyncua_server():
async def add_object(self,node, parent_node, hierarchy): async def add_object(self,node, parent_node, hierarchy):
if (parent_node == None): if (parent_node == None):
if (node.isdigit()): if (node.isdigit()):
node_index = "ns=3;i=" + node node_index = "ns="+self.remote_server_idx+";i=" + node
else: else:
node_index = "ns=3;s=" + node node_index = "ns="+self.remote_server_idx+";s=" + node
await self.server.nodes.objects.add_folder(node_index, hierarchy["name"]) await self.server.nodes.objects.add_folder(node_index, hierarchy["name"])
else: else:
if (parent_node.isdigit()): if (parent_node.isdigit()):
node_index = "ns=3;i=" + parent_node node_index = "ns="+self.remote_server_idx+";i=" + parent_node
else: else:
node_index = "ns=3;s=" + parent_node node_index = "ns="+self.remote_server_idx+";s=" + parent_node
node_space = self.server.get_node(node_index) node_space = self.server.get_node(node_index)
node_id="ns=3;i="+node if node.isdigit() else "ns=3;s="+node node_id="ns="+self.remote_server_idx+";i="+node if node.isdigit() else "ns="+self.remote_server_idx+";s="+node
self.variables[node]={} self.variables[node]={}
self.variables[node]["parent"] = node_index self.variables[node]["parent"] = node_index
self.variables[node]["name"] = hierarchy["name"] self.variables[node]["name"] = hierarchy["name"]
...@@ -112,7 +112,7 @@ received_datatypes=[] ...@@ -112,7 +112,7 @@ received_datatypes=[]
existing_datatypes=[] existing_datatypes=[]
def get_received_hierarchy_array(hierarchy): def get_received_hierarchy_array(hierarchy):
for key in hierarchy: for key in hierarchy:
if(key!="hash"): if(key!="hash" and key!="namespace_idx"):
if(isinstance(hierarchy[key],dict)): if(isinstance(hierarchy[key],dict)):
if('datatype' in hierarchy[key]): if('datatype' in hierarchy[key]):
received_datatypes.append(key+"-"+str(hierarchy[key]["datatype"])) received_datatypes.append(key+"-"+str(hierarchy[key]["datatype"]))
...@@ -123,7 +123,7 @@ def get_received_hierarchy_array(hierarchy): ...@@ -123,7 +123,7 @@ def get_received_hierarchy_array(hierarchy):
async def get_existing_hierarchy_array(client,node_objects): async def get_existing_hierarchy_array(client,node_objects):
node_hierarchy = {} node_hierarchy = {}
for sub_obj in node_objects: for sub_obj in node_objects:
if ("ns=3;" in str(sub_obj)): if ("ns="+asr.remote_server_idx+";" in str(sub_obj)):
node = client.get_node(sub_obj) node = client.get_node(sub_obj)
children_nodes = await node.get_children() children_nodes = await node.get_children()
identifier = str(children_nodes[0].nodeid.Identifier) if children_nodes else "" identifier = str(children_nodes[0].nodeid.Identifier) if children_nodes else ""
...@@ -155,13 +155,14 @@ async def get_existing_hierarchy_array(client,node_objects): ...@@ -155,13 +155,14 @@ async def get_existing_hierarchy_array(client,node_objects):
def add_nodes(nodes_to_add,hierarchy,parent_key=None): def add_nodes(nodes_to_add,hierarchy,parent_key=None):
for key in hierarchy: for key in hierarchy:
if (key != "hash"): if (key != "hash" and key!="namespace_idx"):
if (isinstance(hierarchy[key], dict)): if (isinstance(hierarchy[key], dict)):
if (key in nodes_to_add): if (key in nodes_to_add):
asyncio.run(asr.add_object(key, parent_key,hierarchy[key])) asyncio.run(asr.add_object(key, parent_key,hierarchy[key]))
add_nodes(nodes_to_add,hierarchy[key],key) add_nodes(nodes_to_add,hierarchy[key],key)
def analyse_hierarchy(hierarchy): def analyse_hierarchy(hierarchy):
asr.remote_server_idx = str(hierarchy["namespace_idx"])
array1,datatypes1=get_received_hierarchy_array(hierarchy) array1,datatypes1=get_received_hierarchy_array(hierarchy)
root_node=asr.server.get_root_node() root_node=asr.server.get_root_node()
object_root_node=asyncio.run(root_node.get_children()) object_root_node=asyncio.run(root_node.get_children())
......
...@@ -9,10 +9,10 @@ Namespace_Server ="http://klopc.com" ...@@ -9,10 +9,10 @@ Namespace_Server ="http://klopc.com"
udp_hash_receiver_ip="2.2.2.5" udp_hash_receiver_ip="2.2.2.5"
udp_hash_receiver_port=20002 udp_hash_receiver_port=20002
localIP = "2.2.2.5" localIP = "2.2.2.5"
localPort = 20001 localPort = 20001
bufferSize = 1024 bufferSize = 1024
UDPServerSocket = socket.socket(family=socket.AF_INET, type=socket.SOCK_DGRAM) UDPServerSocket = socket.socket(family=socket.AF_INET, type=socket.SOCK_DGRAM)
UDPServerSocket.bind((localIP, localPort)) UDPServerSocket.bind((localIP, localPort))
......
...@@ -425,7 +425,8 @@ class opcua_pack(): ...@@ -425,7 +425,8 @@ class opcua_pack():
return session return session
def connect(self,address): def connect(self,address):
server_address = ('2.2.2.5', 53531) host,port=address.split("/")[2].split(":")
server_address = (host, int(port))
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect(server_address) sock.connect(server_address)
message = self.helf(address) message = self.helf(address)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment