Changeset 1254 for opsi

Timestamp:

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

Author:

joergs

Message:

Use tinyrpc instead of jsonrpc.

Location:

opsi/server/dass-opsi-tools

Files:

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

opsi/server/dass-opsi-tools/dass-opsi-tools.spec

@@ -1 +1 @@
 # 
-# Copyright  (c)  2012  dass IT GmbH, Koeln, Germany.
+# Copyright  (c)  2012-2021  dass IT GmbH, Koeln, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
@@ -8 +8 @@
 Name:           dass-opsi-tools
 URL:            http://trac.dass-it.de/pub/
-License:        GPL
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Opsi
 Autoreqprov:    on
-Summary:        dass IT addon tools for OPSI
-Version:        1.2
+Summary:        OPSI admin tools from dass IT
+Version:        1.3
 Release:        0
 
 Requires:       python-dateutil
-Requires:       python-json-rpc
+Requires:       python-tinyrpc
 # python-argparse is part of python >= 2.7
 %if ( ( 0%{?suse_version} && 0%{?suse_version} <= 1110 )  || ( 0%{?rhel_version} && 0%{?rhel_version} <= 600 ) )
@@ -53 +53 @@
 %defattr(-,root,root)
 /usr/bin/*
-

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))