Change in vdsm[master]: functional tests: virt: fix devices verification

Yeela Kaplan has uploaded a new change for review.

Change subject: functional tests: virt: fix devices verification
......................................................................

functional tests: virt: fix devices verification

Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6
Signed-off-by: Yeela Kaplan 
---
M tests/functional/virtTests.py
1 file changed, 3 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/43600/1

diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index abe9297..72c8a76 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -220,10 +220,11 @@
                          timeout=10)

def _verifyDevices(self, vmId):
-        status, msg, stats = self.vdsm.getVmList(vmId)
+        status, msg, stats = self.vdsm.getVmStats(vmId)
         self.assertEqual(status, SUCCESS, msg)

-        self.verifyDevicesConf(conf=stats['devices'])
+        if 'devices' in stats:
+            self.verifyDevicesConf(conf=stats['devices'])

@expandPermutations

[e-mail] has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

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'])

Yeela Kaplan has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1: Verified+1

Francesco Romani has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1: Code-Review-1

(1 comment)

question inside, -1 for visibility

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
it is a bit terse. Can you please elaborate on why this change is needed? why and when this broke?
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

[Martin Polednik]

Martin Polednik has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> it is a bit terse. Can you please elaborate on why this change is needed? w

Also, please tell us how to reproduce the issue (and what the issue is)
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

[Martin Polednik]

Martin Polednik has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1: Code-Review-1

Yeela Kaplan has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> Also, please tell us how to reproduce the issue (and what the issue is)

Please notice the verb being used:
'getVmList'.
It does not return a statsList.
I'm pretty sure this code never worked.
Found it while trying to run functional tests using JsonRpc.
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

[Martin Polednik]

Martin Polednik has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> Please notice the verb being used:

Is that some kind of workaround? It does not look for statsList at all, it uses the VdsProxy where getVmList returns 'vmList'
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

Yeela Kaplan has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> Is that some kind of workaround? It does not look for statsList at all, it

but then it tries to access stats['devices'].
This means that you were probably trying to get the stats of the vm and not the vmId using getVmList...
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

[Martin Polednik]

Martin Polednik has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> but then it tries to access stats['devices'].

it is means of accessing devices - and that I can verify works (the devices ARE being processed); on the other hand using getVmStats or getAllVmStats doesn't even return the devices?
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

Yeela Kaplan has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> it is means of accessing devices - and that I can verify works (the devices

getVmList returns a list of UUIDs, so you can't use it to access devices key (first of all, it's not a dictionary and second it does not return the stats of the vmId).

getVmStats will return 'devices' only if the vm has devices.
That is why I have added the 'if'.
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

[Martin Polednik]

Martin Polednik has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> getVmList returns a list of UUIDs, so you can't use it to access devices ke

getVmList returns

{'status': 'Up', 'kernel': '/boot/vmlinuz-3.10.0-229.4.2.el7.x86_64', 'displayIp': '0', 'kvmEnable': 'true', 'nicModel': 'rtl8139,pv', 'smp': '1', 'vmId': '77777777-ffff-3333-bbbb-222222222222', 'pid': '24535', 'devices': [{'device': 'memballoon', 'specParams': {'model': 'none'}, 'type': 'balloon', 'alias': 'balloon0'}, {'device': 'virtio-serial', 'alias': 'virtio-serial0', 'type': 'controller', 'address': {'slot': '0x03', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x0'}}, {'device': 'qxl', 'specParams': {'vram': '65536'}, 'alias': 'video0', 'type': 'video', 'address': {'slot': '0x02', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x0'}}, {'device': 'spice', 'specParams': {'displayIp': '0'}, 'type': 'graphics', 'port': '5900', 'tlsPort': '5901'}, {'index': 2, 'iface': 'ide', 'name': 'hdc', 'format': 'raw', 'alias': 'ide0-1-0', 'readonly': 'True', 'propagateErrors': 'off', 'address': {'bus': '1', 'controller': '0', 'type': 'drive', 'target!
 ': '0', 'unit': '0'}, 'device': 'cdrom', 'shared': False, 'path': '', 'truesize': 0, 'type': 'disk'}, {'device': 'usb', 'alias': 'usb0', 'type': 'controller', 'address': {'slot': '0x01', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x2'}}, {'device': 'ide', 'alias': 'ide0', 'type': 'controller', 'address': {'slot': '0x01', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x1'}}, {'device': 'unix', 'alias': 'channel0', 'type': 'channel', 'address': {'bus': '0', 'controller': '0', 'type': 'virtio-serial', 'port': '1'}}, {'device': 'unix', 'alias': 'channel1', 'type': 'channel', 'address': {'bus': '0', 'controller': '0', 'type': 'virtio-serial', 'port': '2'}}, {'device': 'spicevmc', 'alias': 'channel2', 'type': 'channel', 'address': {'bus': '0', 'controller': '0', 'type': 'virtio-serial', 'port': '3'}}], 'guestDiskMapping': {}, 'pauseCode': 'NOERR', 'vmType': 'kvm', 'initrd': '/boot/initramfs-3.10.0-229.4.2.el7.x86_64.img', 'displaySecurePort': !
 '5901', 'memSize': 256, 'displayPort': '5900', 'clientIp': '', 'statusTime': '4389053540', 'vmName': 'testSimpleVm', 'display': 'qxl', 'kernelArgs': 'rd.break=cmdline rd.shell rd.skipfsck'}

in current implementation of functional tests
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

Yeela Kaplan has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1: -Verified

(1 comment)

https://gerrit.ovirt.org/#/c/43600/1//COMMIT_MSG
Commit Message:

Line 3: AuthorDate: 2015-07-14 18:06:14 +0300
Line 4: Commit:     Yeela Kaplan 
Line 5: CommitDate: 2015-07-14 18:06:14 +0300
Line 6: 
Line 7: functional tests: virt: fix devices verification
> getVmList returns

Looks like it's an issue introduced by the jsonrpc bridge translation.
I will investigate this further.
It's behaving differently there.
Line 8: 
Line 9: Change-Id: I774dfdb3f0bde3822df383c54060b41ba7a2cda6

Yeela Kaplan has abandoned this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Abandoned

[e-mail] has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

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

Yeela Kaplan has restored this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Restored

Yeela Kaplan has abandoned this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Abandoned

[e-mail] has posted comments on this change.

Change subject: functional tests: virt: fix devices verification
......................................................................

Patch Set 1:

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