Irit Goihman has uploaded a new change for review.

Change subject: jsonrpc: revert Host.getVMList command result change
......................................................................

jsonrpc: revert Host.getVMList command result change

patch https://gerrit.ovirt.org/#/c/63408/ changes the result
representation of Host.getVMList and Host.getFullVMList but it
can cause inconsistency of these commands, therefore the change
is removed

Change-Id: I5ed615acfce50d07aa52af740e4963677c6de7cc
Signed-off-by: Irit Goihman <igoih...@redhat.com>
---
M lib/vdsm/rpc/Bridge.py
1 file changed, 2 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/63761/1

diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py
index f264e8d..bd180e0 100644
--- a/lib/vdsm/rpc/Bridge.py
+++ b/lib/vdsm/rpc/Bridge.py
@@ -326,14 +326,6 @@
     return {'path': ret['path']}
 
 
-def remove_status_from_ret(ret):
-    """
-    seprate status from the actual result
-    """
-    del ret['status']
-    return ret
-
-
 ##
 # Possible ways to override a command:
 # - Supply a custom call function if the function name doesn't map directly to
@@ -359,10 +351,8 @@
     'Host_getStorageDomains': {'ret': 'domlist'},
     'Host_getStorageRepoStats': {'ret': Host_getStorageRepoStats_Ret},
     'Host_hostdevListByCaps': {'ret': 'deviceList'},
-    'Host_getVMList': {'call': Host_getVMList_Call,
-                       'ret': remove_status_from_ret},
-    'Host_getVMFullList': {'call': Host_getVMFullList_Call,
-                           'ret': remove_status_from_ret},
+    'Host_getVMList': {'call': Host_getVMList_Call, 'ret': 'vmList'},
+    'Host_getVMFullList': {'call': Host_getVMFullList_Call, 'ret': 'vmList'},
     'Host_getAllVmStats': {'ret': 'statsList'},
     'Host_setupNetworks': {'ret': 'status'},
     'Host_setKsmTune': {'ret': 'status'},


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ed615acfce50d07aa52af740e4963677c6de7cc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoih...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Reply via email to