Changeset 1254 for opsi/server/dass-opsi-tools/usr

Timestamp:

Feb 15, 2021, 6:34:36 PM (4 years ago)

Author:

joergs

Message:

Use tinyrpc instead of jsonrpc.

File:

• opsi/server/dass-opsi-tools/usr/bin/opsiclient (modified) (3 diffs)

opsi/server/dass-opsi-tools/usr/bin/opsiclient

@@ -8 +8 @@
 
 __author__ = "Joerg Steffens"
-__copyright__ = "Copyright 2012-2018, dass IT GmbH"
+__copyright__ = "Copyright 2012-2021, dass IT GmbH"
 __license__ = "GPL"
-__version__ = "1.2"
+__version__ = "1.3"
 __email__ = "joerg.steffens@dass-it.de"
 
@@ -30 +30 @@
 import time
 
-try:
-    import jsonrpc
-except ImportError:
-    import jsonrpclib
-
+from tinyrpc.protocols.jsonrpc import JSONRPCProtocol
+from tinyrpc.transports.http import HttpPostClientTransport
+from tinyrpc import RPCClient
 
 UrlJsonRpc="https://<username>:<password>@opsi:4447/rpc"
@@ -89 +87 @@
         self.nagios=nagios
         self.urlJsonRpc=urlJsonRpc
-        if 'jsonrpc' in sys.modules:
-            self.rpc=jsonrpc.ServiceProxy(self.urlJsonRpc)
-        else:
-            self.rpc=jsonrpclib.ServerProxy(self.urlJsonRpc)
+        self.rpc = RPCClient(JSONRPCProtocol(), HttpPostClientTransport(self.urlJsonRpc, verify=False)).get_proxy()
+
         self.logger.debug( "initialized: " + self.urlJsonRpc )
         self.logger.debug(dir(self.rpc))