Revision 7c28c575
b/lib/rpc.py | ||
---|---|---|
35 | 35 |
import httplib |
36 | 36 |
import logging |
37 | 37 |
|
38 |
import simplejson |
|
39 |
|
|
40 | 38 |
from ganeti import utils |
41 | 39 |
from ganeti import objects |
42 | 40 |
from ganeti import http |
41 |
from ganeti import serializer |
|
43 | 42 |
|
44 | 43 |
|
45 | 44 |
class Client: |
... | ... | |
57 | 56 |
def __init__(self, procedure, args): |
58 | 57 |
self.procedure = procedure |
59 | 58 |
self.args = args |
60 |
self.body = simplejson.dumps(args)
|
|
59 |
self.body = serializer.DumpJson(args, indent=False)
|
|
61 | 60 |
|
62 | 61 |
self.port = utils.GetNodeDaemonPort() |
63 | 62 |
self.nodepw = utils.GetNodeDaemonPassword() |
... | ... | |
115 | 114 |
|
116 | 115 |
for name, req in self.nc.iteritems(): |
117 | 116 |
if req.success and req.resp_status == http.HTTP_OK: |
118 |
results[name] = simplejson.loads(req.resp_body)
|
|
117 |
results[name] = serializer.LoadJson(req.resp_body)
|
|
119 | 118 |
continue |
120 | 119 |
|
121 | 120 |
if req.error: |
Also available in: Unified diff