summaryrefslogtreecommitdiffstats
path: root/base/common/python/pki/system.py
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2014-01-28 21:42:43 -0500
committerEndi S. Dewata <edewata@redhat.com>2014-02-06 16:24:31 -0500
commit32d71bba0075a3bc12c36e5bb29701d0e96ea0ba (patch)
tree764c595e4b452d880533a04fb3edec818aa1c183 /base/common/python/pki/system.py
parent49bfa844a220e8b01784963733f9aa72ff5252ae (diff)
downloadpki-32d71bba0075a3bc12c36e5bb29701d0e96ea0ba.tar.gz
pki-32d71bba0075a3bc12c36e5bb29701d0e96ea0ba.tar.xz
pki-32d71bba0075a3bc12c36e5bb29701d0e96ea0ba.zip
Replaced Jettison with Jackson.
The Jettison library has been replaced with Jackson library as JSON provider for RESTEasy. All class paths and the deployment tools have been updated accordingly. The Python library and the TPS UI have been updated as well to use the new JSON format. Ticket #817
Diffstat (limited to 'base/common/python/pki/system.py')
-rw-r--r--base/common/python/pki/system.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py
index b530d5a10..5d93dbc29 100644
--- a/base/common/python/pki/system.py
+++ b/base/common/python/pki/system.py
@@ -42,7 +42,7 @@ class SecurityDomainClient:
j = r.json()
info = SecurityDomainInfo()
- info.name = j['DomainInfo']['@id']
+ info.name = j['id']
return info
@@ -83,8 +83,7 @@ class SystemConfigClient:
headers = {'Content-type': 'application/json',
'Accept': 'application/json'}
r = self.connection.post('/rest/installer/configure', data, headers)
- info = r.json()['ConfigurationResponse']
- return info
+ return r.json()
class SystemStatusClient:
@@ -97,6 +96,6 @@ class SystemStatusClient:
return r.text
-encoder.TYPES['ConfigurationRequest'] = ConfigurationRequest
-encoder.TYPES['ConfigurationResponse'] = ConfigurationResponse
+encoder.NOTYPES['ConfigurationRequest'] = ConfigurationRequest
+encoder.NOTYPES['ConfigurationResponse'] = ConfigurationResponse
encoder.NOTYPES['SystemCertData'] = SystemCertData