Irit Goihman has uploaded a new change for review.
Change subject: net libvirt hook: revert vmList change
......................................................................
net libvirt hook: revert vmList change
Patch 78ea853e131da3b91b812315a0656b8f99d7fef4 is reverted so the
vmList key change is also reverted.
Change-Id: Ifec8f641276d3f48b6a60a14ee6d3b8a3abd6359
Signed-off-by: Irit Goihman <igoih...@redhat.com>
---
M tests/network/vm_migrate_hook_test.py
M vdsm/virt/vm_migrate_hook.py
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/63762/1
diff --git a/tests/network/vm_migrate_hook_test.py
b/tests/network/vm_migrate_hook_test.py
index 7f11995..7294734 100644
--- a/tests/network/vm_migrate_hook_test.py
+++ b/tests/network/vm_migrate_hook_test.py
@@ -31,7 +31,7 @@
class MockVdscli(object):
@staticmethod
def fullList(*args, **kwargs):
- return {'vmList': [VM_FULL_LIST]}
+ return {'items': [VM_FULL_LIST]}
class MockJsonrpcvdscli(object):
diff --git a/vdsm/virt/vm_migrate_hook.py b/vdsm/virt/vm_migrate_hook.py
index 5379cef..633e4f0 100755
--- a/vdsm/virt/vm_migrate_hook.py
+++ b/vdsm/virt/vm_migrate_hook.py
@@ -179,7 +179,7 @@
def _vm_item(vdscli, vm_uuid):
result = vdscli.fullList(fullStatus=True, vmList=(vm_uuid,))
- return result['vmList'][0] if len(result['vmList']) else None
+ return result['items'][0] if len(result['items']) else None
def _vdscli():
--
To view, visit https://gerrit.ovirt.org/63762
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifec8f641276d3f48b6a60a14ee6d3b8a3abd6359
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
