|
@@ -15,14 +15,8 @@ class JSONRPCServer:
|
|
self.server.register_function(self.service.sumation, 'sum')
|
|
self.server.register_function(self.service.sumation, 'sum')
|
|
self.server.register_function(self.service.sumation, 'notify_sum')
|
|
self.server.register_function(self.service.sumation, 'notify_sum')
|
|
self.server.register_function(self.service.sumation, 'namespace.sum')
|
|
self.server.register_function(self.service.sumation, 'namespace.sum')
|
|
- # self.server.register_introspection_functions()
|
|
|
|
- # self.JSONRPC_server.register_function(lambda x, y: x + y, 'add')
|
|
|
|
- self.thread = threading.Thread(self.server.serve_forever)
|
|
|
|
- self.thread.daemon = True
|
|
|
|
- self.thread.stop = self.stop
|
|
|
|
|
|
+ self.thread = threading.Thread(target=self.server.serve_forever)
|
|
self.thread.start()
|
|
self.thread.start()
|
|
- # self._wait_for_rpc_start()
|
|
|
|
- # time.sleeep(3)
|
|
|
|
|
|
|
|
def _wait_for_rpc_start(self):
|
|
def _wait_for_rpc_start(self):
|
|
rpc = jsonrpclib.Server("http://{0}:{1}".format(SERVER_ADDR[0], SERVER_ADDR[1]))
|
|
rpc = jsonrpclib.Server("http://{0}:{1}".format(SERVER_ADDR[0], SERVER_ADDR[1]))
|
|
@@ -42,9 +36,28 @@ class JSONRPCServer:
|
|
|
|
|
|
class JSONRPCClient:
|
|
class JSONRPCClient:
|
|
|
|
|
|
- def __init__(self) -> None:
|
|
|
|
- self.client = jsonrpclib.Server("http://{0}:{1}".format(SERVER_ADDR[0], SERVER_ADDR[1]))
|
|
|
|
|
|
+ def __init__(self):
|
|
|
|
+
|
|
|
|
+ # self.client = jsonrpclib.Server("http://{0}:{1}".format(SERVER_ADDR[0], SERVER_ADDR[1]))
|
|
|
|
+ self.client = jsonrpclib.Server("http://{0}:{1}".format("192.168.31.226", 888))
|
|
|
|
+ # self.thread = threading.Thread(target=self.test)
|
|
|
|
+ # self.thread.start()
|
|
|
|
+
|
|
|
|
+ def test(self):
|
|
|
|
+ # while True:
|
|
|
|
+ # # print(self.client.get_device_info())
|
|
|
|
+ # # self.client.get_changes()
|
|
|
|
+ # self.client.get_changes()
|
|
|
|
+ # print(jsonrpclib.history.request)
|
|
|
|
+ # print(jsonrpclib.history.response)
|
|
|
|
+ # time.sleep(3)
|
|
|
|
|
|
|
|
+ # self.client.get_changes()
|
|
|
|
+ self.client.get_opc_config()
|
|
|
|
+
|
|
|
|
+ # print(jsonrpclib.history.request)
|
|
|
|
+ # print(jsonrpclib.history.response)
|
|
|
|
+
|
|
|
|
|
|
class ExampleService:
|
|
class ExampleService:
|
|
|
|
|
|
@@ -66,11 +79,12 @@ class ExampleService:
|
|
|
|
|
|
class ExampleAggregateService(ExampleService):
|
|
class ExampleAggregateService(ExampleService):
|
|
|
|
|
|
- def __init__(self) -> None:
|
|
|
|
|
|
+ def __init__(self):
|
|
self.sub_service = ExampleService()
|
|
self.sub_service = ExampleService()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-server = JSONRPCServer()
|
|
|
|
|
|
+# server = JSONRPCServer()
|
|
client = JSONRPCClient()
|
|
client = JSONRPCClient()
|
|
-print(client.ping())
|
|
|
|
|
|
+client.test()
|
|
|
|
+# print(client.ping())
|