Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Dan Kenigsberg has submitted this change and it was merged. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. jsonrpcvdscli: fix Host.getVMList command result Host.getVMList and Host.getFullVMList are similar commands that differ in their verbosity level. Their result should be represented as a value inside a dictionary with 'vmList' key. Instead of that, it was represented as a list and during the creation of JsonRPCResponse it was re constructed inside a dictionary holding the result inside 'items' key. Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Signed-off-by: Irit Goihman Reviewed-on: https://gerrit.ovirt.org/63408 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski Reviewed-by: Yaniv Bronhaim --- M lib/vdsm/rpc/Bridge.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Verified -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
gerrit-hooks has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 4: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Yaniv Bronhaim has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Piotr Kliczewski has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Irit Goihman has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
gerrit-hooks has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 3: * 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Piotr Kliczewski has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Yaniv Bronhaim has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
gerrit-hooks has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Irit Goihman has posted comments on this change.
Change subject: jsonrpcvdscli: fix Host.getVMList command result
..
Patch Set 2: Verified+1
(1 comment)
https://gerrit.ovirt.org/#/c/63408/1/lib/vdsm/rpc/Bridge.py
File lib/vdsm/rpc/Bridge.py:
Line 360: 'Host_getStorageDomains': {'ret': 'domlist'},
Line 361: 'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret},
Line 362: 'Host_hostdevListByCaps': {'ret': 'deviceList'},
Line 363: 'Host_getVMList': {'call': Host_getVMList_Call,
Line 364:'ret': Host_getVMList_Ret},
> Please keep formatting as it is in this module.
Done
Line 365: 'Host_getVMFullList': {'call': Host_getVMFullList_Call,
Line 366:'ret': Host_getVMList_Ret},
Line 367: 'Host_getAllVmStats': {'ret': 'statsList'},
Line 368: 'Host_setupNetworks': {'ret': 'status'},
--
To view, visit https://gerrit.ovirt.org/63408
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman
Gerrit-Reviewer: Irit Goihman
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: gerrit-hooks
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Piotr Kliczewski has posted comments on this change.
Change subject: jsonrpcvdscli: fix Host.getVMList command result
..
Patch Set 1: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/63408/1/lib/vdsm/rpc/Bridge.py
File lib/vdsm/rpc/Bridge.py:
Line 360: 'Host_getStorageDomains': {'ret': 'domlist'},
Line 361: 'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret},
Line 362: 'Host_hostdevListByCaps': {'ret': 'deviceList'},
Line 363: 'Host_getVMList':
Line 364: {
Please keep formatting as it is in this module.
Line 365: 'call': Host_getVMList_Call,
Line 366: 'ret': Host_getVMList_Ret
Line 367: },
Line 368: 'Host_getVMFullList':
--
To view, visit https://gerrit.ovirt.org/63408
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman
Gerrit-Reviewer: Irit Goihman
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: gerrit-hooks
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Yaniv Bronhaim has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Irit Goihman has posted comments on this change.
Change subject: jsonrpcvdscli: fix Host.getVMList command result
..
Patch Set 1:
In [3]: server.list()
Out[3]:
{'status': {'code': 0, 'message': 'Done'},
u'vmList': [u'7fbcda8e-847c-449a-a25d-105a1de02cb8']}
In [5]: server.fullList()
Out[5]:
{'status': {'code': 0, 'message': 'Done'},
u'vmList': [{u'acpiEnable': u'true',
u'bootMenuEnable': u'false',
u'clientIp': u'',
u'cpuType': u'Penryn',
...
--
To view, visit https://gerrit.ovirt.org/63408
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman
Gerrit-Reviewer: Irit Goihman
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: gerrit-hooks
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Irit Goihman has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command result .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
gerrit-hooks has posted comments on this change. Change subject: jsonrpcvdscli: fix Host.getVMList command 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/63408 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: jsonrpcvdscli: fix Host.getVMList command result
Irit Goihman has uploaded a new change for review.
Change subject: jsonrpcvdscli: fix Host.getVMList command result
..
jsonrpcvdscli: fix Host.getVMList command result
Host.getVMList and Host.getFullVMList are similar commands that differ in
their verbosity level. Their result should be represented as a value inside
a dictionary with 'vmList' key. Instead of that, it was represented as
a list and during the creation of JsonRPCResponse it was re constructed
inside a dictionary holding the result inside 'items' key.
Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043
Signed-off-by: Irit Goihman
---
M lib/vdsm/rpc/Bridge.py
1 file changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/63408/1
diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py
index bd180e0..79c4bc0 100644
--- a/lib/vdsm/rpc/Bridge.py
+++ b/lib/vdsm/rpc/Bridge.py
@@ -270,6 +270,15 @@
return API.Global().getVMList(False, vmList, onlyUUID)
+def Host_getVMList_Ret(ret):
+"""
+The returned dictionary doesn't separate the vmList from the status code
+so we need to rebuild the result.
+"""
+del ret['status']
+return ret
+
+
def Host_getVMFullList_Call(api, args):
"""
This call is interested in returning full status.
@@ -351,8 +360,16 @@
'Host_getStorageDomains': {'ret': 'domlist'},
'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret},
'Host_hostdevListByCaps': {'ret': 'deviceList'},
-'Host_getVMList': {'call': Host_getVMList_Call, 'ret': 'vmList'},
-'Host_getVMFullList': {'call': Host_getVMFullList_Call, 'ret': 'vmList'},
+'Host_getVMList':
+{
+'call': Host_getVMList_Call,
+'ret': Host_getVMList_Ret
+},
+'Host_getVMFullList':
+{
+'call': Host_getVMFullList_Call,
+'ret': Host_getVMList_Ret
+},
'Host_getAllVmStats': {'ret': 'statsList'},
'Host_setupNetworks': {'ret': 'status'},
'Host_setKsmTune': {'ret': 'status'},
--
To view, visit https://gerrit.ovirt.org/63408
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28f39417b0006957670bb6ccbdb673f2e0f89043
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
