Zhou Zheng Sheng has uploaded a new change for review. Change subject: add VM creation test over localfs storage layout ......................................................................
add VM creation test over localfs storage layout It can be easily extended to use nfs or iscsi storage layout Change-Id: Ie176b96d56803e46b46f50b9fbee5255ad019578 Signed-off-by: Zhou Zheng Sheng <[email protected]> --- M tests/functional/xmlrpcTests.py 1 file changed, 46 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/8183/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index 451a4cc..31ffcd0 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -152,6 +152,16 @@ def testStartSmallVM(self): self.skipNoKVM() + conf = {'display': 'vnc', + 'kvmEnable': 'true', + 'memSize': '256', + 'vmId': '77777777-ffff-3333-bbbb-222222222222', + 'vmName': 'vdsm_testSmallVM', + 'vmType': 'kvm'} + + self._runVMKernelBoot(conf) + + def _runVMKernelBoot(self, vmDef): kernelVer = os.uname()[2] kernelPath = "/boot/vmlinuz-" + kernelVer initramfsPath = "/boot/initramfs-%s.img" % kernelVer @@ -164,30 +174,24 @@ raise SkipTest("Can not locate initramfs image for release %s" % kernelVer) - VMID = '77777777-ffff-3333-bbbb-222222222222' - conf = {'display': 'vnc', - 'kernel': kernelPath, - 'initrd': initramfsPath, - # The initramfs is generated by dracut. The following - # arguments will be interpreted by init scripts created by - # dracut. - 'kernelArgs': 'rd.break=cmdline rd.shell rd.skipfsck', - 'kvmEnable': 'true', - 'memSize': '256', - 'vmId': VMID, - 'vmName': 'vdsm_testSmallVM', - 'vmType': 'kvm'} + vmDef.update({'kernel': kernelPath, + 'initrd': initramfsPath, + # The initramfs is generated by dracut. The following + # arguments will be interpreted by init scripts created + # by dracut. + 'kernelArgs': 'rd.break=cmdline rd.shell rd.skipfsck'}) + vmid = vmDef['vmId'] def assertVMAndGuestUp(): - self.assertVmUp(VMID) - self.assertGuestUp(VMID) + self.assertVmUp(vmid) + self.assertGuestUp(vmid) try: - self.assertVdsOK(self.s.create(conf)) + self.assertVdsOK(self.s.create(vmDef)) # wait 65 seconds for VM to come up until timeout self.retryAssert(assertVMAndGuestUp, 65, 1) finally: - destroyResult = self.s.destroy(VMID) + destroyResult = self.s.destroy(vmid) self.assertVdsOK(destroyResult) @@ -196,6 +200,31 @@ with _localfsStore(conf['conn']), self._vdsmStorageLayout(conf): pass + def testSimpleVMoLocalfs(self): + self.skipNoKVM() + + localfs = storageLayouts['localfs'] + drives = [] + for poolid, domains in localfs['layout'].iteritems(): + for sdid, imageList in domains.iteritems(): + for imgid in imageList: + volume = localfs['img'][imgid] + drives.append({'poolID': poolid, + 'domainID': sdid, + 'imageID': imgid, + 'volumeID': volume['volid'], + 'format': volume['format']}) + vmDef = {'display': 'vnc', + 'kvmEnable': 'true', + 'memSize': '256', + 'vmId': '88888888-eeee-ffff-aaaa-111111111111', + 'vmName': 'vdsm_testSmallVM_localfs', + 'vmType': 'kvm', + 'drives': drives} + + with _localfsStore(localfs['conn']), self._vdsmStorageLayout(localfs): + self._runVMKernelBoot(vmDef) + @rollbackManager def _vdsmStorageLayout(self, conf, rollback): connections = conf['conn'] -- To view, visit http://gerrit.ovirt.org/8183 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie176b96d56803e46b46f50b9fbee5255ad019578 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
