Change in vdsm[master]: vdscli: jsonrpc: fix getVdsCapabilities and Stats result

Yeela Kaplan has uploaded a new change for review.

Change subject: vdscli: jsonrpc: fix getVdsCapabilities and Stats result
......................................................................

vdscli: jsonrpc: fix getVdsCapabilities and Stats result

so it will be compatible with result we receive
using xmlrpc vdscli

Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com&gt;
---
M lib/vdsm/jsonrpcvdscli.py
1 file changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/43436/1

diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py
index 16a5d5e..c56ec1d 100644
--- a/lib/vdsm/jsonrpcvdscli.py
+++ b/lib/vdsm/jsonrpcvdscli.py
@@ -45,6 +45,15 @@
     def __init__(self, client):
         self._client = client
 
+    def _addInfo(self, res):
+        newRes = {
+            'status': res['status']
+        }
+        del res['status']
+        newRes['info'] = res
+
+        return newRes
+
     def _callMethod(self, methodName, *args):
         try:
             method = _COMMAND_CONVERTER[methodName]
@@ -68,7 +77,12 @@
             # None is translated to True inside our JSONRPC implementation
             return response.success(**resp.result)
 
-        return response.success()
+        result = response.success()
+
+        if method in ('getVdsCapabilities', 'getVdsStats'):
+            return self._addInfo(result)
+
+        return result
 
     def migrationCreate(self, params):
         return self._callMethod('migrationCreate',


-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;

automation(a)ovirt.org has posted comments on this change.

Change subject: vdscli: jsonrpc: fix getVdsCapabilities and Stats result
......................................................................


Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Change in vdsm[master]: vdscli: jsonrpc: return results compatible with xmlrpc

automation(a)ovirt.org has posted comments on this change.

Change subject: vdscli: jsonrpc: return results compatible with xmlrpc
......................................................................


Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

Change in vdsm[master]: vdscli: jsonrpc: return results compatible with xmlrpc

Francesco Romani has posted comments on this change.

Change subject: vdscli: jsonrpc: return results compatible with xmlrpc
......................................................................


Patch Set 2: Code-Review-1

(2 comments)

-1 for visibility
one question and one possible bug inside

https://gerrit.ovirt.org/#/c/43436/2/lib/vdsm/jsonrpcvdscli.py
File lib/vdsm/jsonrpcvdscli.py:

Line 51:         }
Line 52:         del res['status']
Line 53:         newRes[name] = res
Line 54: 
Line 55:         return newRes
nice, but now I wonder if it isn't simpler and cleaner to fix our JSONRPC binding
instead of doing this work twice, one inside the bindings to flatten the result, one here
to rebuild the structure.
Line 56: 
Line 57:     def _callMethod(self, methodName, *args):
Line 58:         try:
Line 59:             method = _COMMAND_CONVERTER[methodName]


Line 85:         if result and result is not True:
Line 86:             # None is translated to True inside our JSONRPC implementation
Line 87:             return response.success(**result)
Line 88: 
Line 89:         result = response.success()
this must elided, or 'result' will be rebound to a plain success value, making the
lines 76-88 useless.
Line 90: 
Line 91:         return result
Line 92: 
Line 93:     def migrationCreate(self, params):


-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: Yes

Change in vdsm[master]: vdscli: jsonrpc: return results compatible with xmlrpc

Yeela Kaplan has abandoned this change.

Change subject: vdscli: jsonrpc: return results compatible with xmlrpc
......................................................................


Abandoned

-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org

Change in vdsm[master]: vdscli: jsonrpc: return results compatible with xmlrpc

automation(a)ovirt.org has posted comments on this change.

Change subject: vdscli: jsonrpc: return results compatible with xmlrpc
......................................................................


Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found

-- 
To view, visit https://gerrit.ovirt.org/43436
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd0c7f787b1ad3475328080d9043046ce81a2cbd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No