vdsm-patches October 2012

vdsm-patches@lists.fedorahosted.org

61 participants
441 discussions

Change in vdsm[master]: Add local storage xmlrpc functional test
by lvroyce＠linux.vnet.ibm.com 22 Nov '12

22 Nov '12

Hello Adam Litke, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/5860 to review the following change. Change subject: Add local storage xmlrpc functional test ...................................................................... Add local storage xmlrpc functional test Add defintion parser for functional test case reusable, add local storage xmlrpc tests it can be extend to nfs and iscsi type Change-Id: I4e2e80fa88d66d9bc1a4ba855e2df51ba8165e0a Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M configure.ac M tests/functional/Makefile.am A tests/functional/xmlrpcTests.py M vdsm.spec.in 4 files changed, 198 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/5860/1 -- To view, visit http://gerrit.ovirt.org/5860 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e2e80fa88d66d9bc1a4ba855e2df51ba8165e0a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

3 6

Change in vdsm[master]: confNet: report missing net params as ERR_BAD_PARAMS
by Dan Kenigsberg 21 Nov '12

21 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: confNet: report missing net params as ERR_BAD_PARAMS ...................................................................... confNet: report missing net params as ERR_BAD_PARAMS Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/6959/1 -- To view, visit http://gerrit.ovirt.org/6959 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e6b48332f27d1b976a8cd8069d252133ff32378 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 4

Change in vdsm[master]: Added an option to create a watchdog device.
by shaohef＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

ShaoHe Feng has uploaded a new change for review. Change subject: Added an option to create a watchdog device. ...................................................................... Added an option to create a watchdog device. A support for a watchdog device was added to the "devices" configuration. Also add the watchdog event callback. model of watchdog: 'i6300esb' default model, emulating a PCI Intel 6300ESB 'ib700' emulating an ISA iBase IB700 action of watchdog: 'reset' default, forcefully reset the guest 'shutdown' gracefully shutdown the guest (not recommended) 'poweroff' forcefully power off the guest 'pause' pause the guest 'none' do nothing 'dump' automatically dump the guest The watchdog device can used to detect guest crash, and if choose 'dump' action, the libvirt will dump the guest automatically. The directory to save dump files can be configured by auto_dump_path in file /etc/libvirt/qemu.conf. The watchdog device requires an additional driver and management daemon in the guest. Just enabling the watchdog in the vdsm "devices" configuration does not do anything useful on its own. Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- M vdsm/libvirtconnection.py M vdsm/libvirtev.py M vdsm/libvirtvm.py M vdsm/vm.py 4 files changed, 102 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/7535/1 diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py index e525996..25e2494 100644 --- a/vdsm/libvirtconnection.py +++ b/vdsm/libvirtconnection.py @@ -63,6 +63,12 @@ elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB: path, type, status = args[:-1] v._onBlockJobEvent(path, type, status) + elif eventid == libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG: + wdargs = args[:-1] + action = libvirtev.watchdogActionToString(wdargs[0]) + cif.log.debug("watchdog event: Domain %s(%s). Action: %s", + dom.name(), dom.ID(), action) + v._onWatchdogEvent(dom.name(), dom.ID(), action) else: v.log.warning('unknown eventid %s args %s', eventid, args) except: @@ -118,7 +124,8 @@ libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, - libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB): + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): conn.domainEventRegisterAny(None, ev, __eventCallback, (cif, ev)) for name in dir(libvirt.virConnect): diff --git a/vdsm/libvirtev.py b/vdsm/libvirtev.py index 92a7a0e..b12b916 100644 --- a/vdsm/libvirtev.py +++ b/vdsm/libvirtev.py @@ -444,6 +444,16 @@ return eventStrings[event] +def watchdogActionToString(action): + actionStrings = ("No action, watchdog ignored", + "Guest CPUs are paused", + "Guest CPUs are reset", + "Guest is forcably powered off", + "Guest is requested to gracefully shutdown", + "No action, a debug message logged") + return actionStrings[action] + + def myDomainEventCallback1(conn, dom, event, detail, opaque): print ("myDomainEventCallback1 EVENT: Domain %s(%s) %s %d" % (dom.name(), dom.ID(), eventToString(event), detail)) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index e95e94b..cc75d78 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1188,6 +1188,20 @@ m.setAttribute('model', self.specParams['model']) return m +class WatchdogDevice(LibvirtVmDevice): + def getXML(self): + """ + Create domxml for a watchdog device. + + <watchdog model='i6300esb' action='dump'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </watchdog> + """ + m = self.createXmlElem(self.type, None, ['address']) + m.setAttribute('model', self.specParams['model']) + if 'action' in self.specParams: + m.setAttribute('action', self.specParams['action']) + return m class RedirDevice(LibvirtVmDevice): def getXML(self): @@ -1331,6 +1345,7 @@ self._getUnderlyingVideoDeviceInfo() self._getUnderlyingControllerDeviceInfo() self._getUnderlyingBalloonDeviceInfo() + self._getUnderlyingWatchdogDeviceInfo() # Obtain info of all unknown devices. Must be last! self._getUnderlyingUnknownDeviceInfo() @@ -1420,6 +1435,7 @@ vm.CONTROLLER_DEVICES: ControllerDevice, vm.GENERAL_DEVICES: GeneralDevice, vm.BALLOON_DEVICES: BalloonDevice, + vm.WATCHDOG_DEVICES: WatchdogDevice, vm.REDIR_DEVICES: RedirDevice} for devType, devClass in devMap.items(): @@ -2031,6 +2047,10 @@ self.saveState() + def _onWatchdogEvent(self, name, vmid, action): + self.log.debug("Watchdog event comes from guest %s(%s). " + "Action: %s", name, vmid, action) + def changeCD(self, drivespec): return self._changeBlockDev('cdrom', 'hdc', drivespec) @@ -2374,6 +2394,38 @@ dev['address'] = address dev['alias'] = alias + def _getUnderlyingWatchdogDeviceInfo(self): + """ + Obtain watchdog device info from libvirt. + """ + watchdogxml = _domParseStr(self._lastXMLDesc).childNodes[0]. \ + getElementsByTagName('devices')[0]. \ + getElementsByTagName('watchdog') + for x in watchdogxml: + action = x.getAttribute('action') + # Ignore watchdog device without address. + if not x.getElementsByTagName('address'): + continue + + address = self._getUnderlyingDeviceAddress(x) + alias = x.getElementsByTagName('alias')[0].getAttribute('name') + + for dev in self._devices[vm.WATCHDOG_DEVICES]: + if not hasattr(dev, 'address'): + dev.address = address + dev.alias = alias + if not "action" in dev.specParams: + dev.specParams['action'] = action + + for dev in self.conf['devices']: + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not dev.get('address')): + dev['address'] = address + dev['alias'] = alias + if ((dev['type'] == vm.WATCHDOG_DEVICES) and + not "action" in dev['specParams']): + dev['specParams']['action'] = action + def _getUnderlyingVideoDeviceInfo(self): """ Obtain video devices info from libvirt. diff --git a/vdsm/vm.py b/vdsm/vm.py index 949a3ee..d24d1a4 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -45,6 +45,7 @@ GENERAL_DEVICES = 'general' BALLOON_DEVICES = 'balloon' REDIR_DEVICES = 'redir' +WATCHDOG_DEVICES = 'watchdog' """ A module containing classes needed for VM communication. @@ -310,7 +311,8 @@ self._devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: [],} def _get_lastStatus(self): SHOW_PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up') @@ -381,11 +383,24 @@ 'index': 0, 'truesize': 0}) return removables + def _removeRedundantDevices(self, devices): + counters = 0 + for dev in self.conf['devices']: + if (dev['type'] == devices): + counters += 1 + if (counters > 1): + self.conf['devices'].remove(dev) + if (counters > 1): + self.log.warning("%d redundant %s devices are removed", + counters-1, devices) + return counters + def getConfDevices(self): devices = {DISK_DEVICES: [], NIC_DEVICES: [], SOUND_DEVICES: [], VIDEO_DEVICES: [], CONTROLLER_DEVICES: [], GENERAL_DEVICES: [], - BALLOON_DEVICES: [], REDIR_DEVICES: []} + BALLOON_DEVICES: [], REDIR_DEVICES: [], + WATCHDOG_DEVICES: []} for dev in self.conf.get('devices'): try: devices[dev['type']].append(dev) @@ -417,8 +432,23 @@ devices[CONTROLLER_DEVICES] = self.getConfController() devices[GENERAL_DEVICES] = [] devices[BALLOON_DEVICES] = [] + devices[WATCHDOG_DEVICES] = [] devices[REDIR_DEVICES] = [] else: + # libvirt only support one watchdog device + # before getting devices list, check WATCHDOG_DEVICES and + # try to remove redundant watchdog devices + self._removeRedundantDevices(WATCHDOG_DEVICES) + # must assign the model for watchdog device to libvirt + # but the action can be assigned default by libvirt + # so ignore the action + for dev in self.conf['devices']: + if (dev['type'] == WATCHDOG_DEVICES): + if not 'specParams' in dev: + dev['specParams'] = {} + if not 'model' in dev['specParams']: + dev['specParams']['model'] = 'i6300esb' + devices = self.getConfDevices() # Normalize vdsm images -- To view, visit http://gerrit.ovirt.org/7535 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b7970a9050ab0279fe03371b9a77692fba30af8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>

12 35

Change in vdsm[master]: avoid creating hangover in storage domain cache after format...
by zhshzhou＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

Zhou Zheng Sheng has uploaded a new change for review. Change subject: avoid creating hangover in storage domain cache after formatting ...................................................................... avoid creating hangover in storage domain cache after formatting HSM._recycle(self, dom) tries to delete the storage domain from cache by calling "sdCache.manuallyRemoveDomain(dom.sdUUID)". This is OK, but when it invokes "dom.format(dom.sdUUID)" to format storage domain, the "dom" is a proxy object and have to look for the true storage domain object by calling 'StorageDomainCache._realProduce()', thus cause the storage domain added to the cache again. This bug will prevent us re-using the storage domain UUID even though we format it. This patch invokes the format method of the proxy object first, then delete the storage domain from cache, and can avoid creating hangovers. Change-Id: Ie13a97ad6830553cbd099189dfb82d6f02ce82fe Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=806774 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M vdsm/storage/hsm.py 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/8144/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index a89274a..8512f08 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2192,11 +2192,14 @@ #TODO: Remove this function when formatStorageDomain() is removed. def _recycle(self, dom): try: - sdCache.manuallyRemoveDomain(dom.sdUUID) - except KeyError: - self.log.warn("Storage domain %s doesn't exist in cache. Trying recycle leftovers ...", dom.sdUUID) + dom.format(dom.sdUUID) + finally: + try: + sdCache.manuallyRemoveDomain(dom.sdUUID) + except KeyError: + self.log.warn("Storage domain %s doesn't exist in cache. " + "Trying recycle leftovers ...", dom.sdUUID) - dom.format(dom.sdUUID) @public def formatStorageDomain(self, sdUUID, autoDetach = False, options = None): -- To view, visit http://gerrit.ovirt.org/8144 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie13a97ad6830553cbd099189dfb82d6f02ce82fe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

8 17

Change in vdsm[master]: Adding hooks support for NIC hotplug
by itzikb＠mellanox.com 20 Nov '12

20 Nov '12

Itzik Brown has uploaded a new change for review. Change subject: Adding hooks support for NIC hotplug ...................................................................... Adding hooks support for NIC hotplug Adding the ability to write hooks for events of NIC hotplug and hotunplug. Hooks are: before_nic_plug and after_nic_unplug Change-Id: I253104ee9831a881e2fb06f0a658631662611d77 Signed-off-by: Itzik Brown <itzikb(a)mellanox.com> --- M vdsm.spec.in M vdsm/hooks.py M vdsm/libvirtvm.py M vdsm_hooks/Makefile.am 4 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/7224/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 23afd6b..0d5f82d 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -658,6 +658,8 @@ %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_set_ticket %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_set_ticket +%dir %{_libexecdir}/%{vdsm_name}/hooks/before_nic_plug +%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_unplug %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vdsm_start %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop %{_datadir}/%{vdsm_name}/addNetwork diff --git a/vdsm/hooks.py b/vdsm/hooks.py index 5b79cee..64263b3 100644 --- a/vdsm/hooks.py +++ b/vdsm/hooks.py @@ -174,6 +174,14 @@ raiseError=False, params=params) +def before_nic_hotplug(domxml, vmconf={}): + return _runHooksDir(domxml, 'before_vm_hotplug', vmconf=vmconf) + + +def after_nic_unplug(domxml, vmconf={}): + return _runHooksDir(domxml, 'after_vm_unplug', vmconf=vmconf) + + def before_vdsm_start(): return _runHooksDir(None, 'before_vdsm_start', raiseError=False) diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 3b7cfc5..4ae54f7 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1395,12 +1395,14 @@ nicParams = params.get('nic', {}) nic = NetworkInterfaceDevice(self.conf, self.log, **nicParams) nicXml = nic.getXML().toprettyxml(encoding='utf-8') + nicXml = hooks.before_nic_hotplug(nicXml, self.conf) self.log.debug("Hotplug NIC xml: %s" % (nicXml)) try: self._dom.attachDevice(nicXml) except libvirt.libvirtError, e: self.log.error("Hotplug failed", exc_info=True) + nicXml = hooks.after_nic_unplug(nicXml, self.conf) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] return {'status' : {'code': errCode['hotplugNic']['status']['code'], @@ -1454,6 +1456,7 @@ try: self._dom.detachDevice(nicXml) + hooks.after_nic_unplug(nicXml, self.conf) except libvirt.libvirtError, e: self.log.error("Hotunplug failed", exc_info=True) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..36919d9 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -74,6 +74,8 @@ after_vm_destroy \ before_vm_set_ticket \ after_vm_set_ticket \ + before_nic_plug \ + after_nic_unplug \ before_vdsm_start \ after_vdsm_stop -- To view, visit http://gerrit.ovirt.org/7224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I253104ee9831a881e2fb06f0a658631662611d77 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Itzik Brown <itzikb(a)mellanox.com>

5 20

Change in vdsm[master]: hsm: use misc.parseBool instead of ad-hoc bool convertion
by zhshzhou＠linux.vnet.ibm.com 20 Nov '12

20 Nov '12

Zhou Zheng Sheng has uploaded a new change for review. Change subject: hsm: use misc.parseBool instead of ad-hoc bool convertion ...................................................................... hsm: use misc.parseBool instead of ad-hoc bool convertion Change-Id: I2ce0ec34d10380c8e1e8bd94e17ef436deb28579 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M vdsm/storage/hsm.py 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/8482/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 50d6ce1..e1f61c7 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -1705,9 +1705,7 @@ lvm.createVG(vgname, devices, blockSD.STORAGE_UNREADY_DOMAIN_TAG, metadataSize=blockSD.VG_METADATASIZE, - force=(force == True) or \ - (type(force) == type("") and \ - (force.capitalize() == "True"))) + force=misc.parseBool(force)) return dict(uuid=lvm.getVG(vgname).uuid) -- To view, visit http://gerrit.ovirt.org/8482 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ce0ec34d10380c8e1e8bd94e17ef436deb28579 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

3 7

Change in vdsm[master]: [WIP] used gluster cli xml output
by barumuga＠redhat.com 19 Nov '12

19 Nov '12

Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/7951 to review the following change. Change subject: [WIP] used gluster cli xml output ...................................................................... [WIP] used gluster cli xml output Below verbs are using gluster cli xml output glusterVolumesList glusterVolumeCreate glusterVolumeStart glusterVolumeStop glusterVolumeDelete glusterVolumeSet glusterVolumeReset glusterVolumeAddBrick glusterVolumeRemoveBrickForce glusterHostAdd glusterHostRemove Change-Id: I364930675dcc433dfc0432a343fc66e91721e801 Signed-off-by: Bala.FA <barumuga(a)redhat.com> --- M tests/gluster_cli_tests.py M vdsm/gluster/api.py M vdsm/gluster/cli.py 3 files changed, 195 insertions(+), 179 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/7951/1 diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py index bb88918..e5fe1ce 100644 --- a/tests/gluster_cli_tests.py +++ b/tests/gluster_cli_tests.py @@ -39,41 +39,98 @@ raise SkipTest("vdsm-gluster not found") def _parseVolumeInfo_empty_test(self): - out = ['No volumes present'] - self.assertFalse(gcli._parseVolumeInfo(out)) + out = """<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<cliOutput> + <opRet>0</opRet> + <opErrno>0</opErrno> + <opErrstr/> + <volInfo/> +</cliOutput> +""" + tree = etree.fromstring(out) + self.assertFalse(gcli._parseVolumeInfo(tree)) def _parseVolumeInfo_test(self): - out = [' ', - 'Volume Name: music', - 'Type: Distribute', - 'Volume ID: 1e7d2638-fb77-4325-94fd-3242650a013c', - 'Status: Stopped', - 'Number of Bricks: 2', - 'Transport-type: tcp', - 'Bricks:', - 'Brick1: 192.168.122.167:/tmp/music-b1', - 'Brick2: 192.168.122.167:/tmp/music-b2', - 'Options Reconfigured:', - 'auth.allow: *'] - volumeInfo = gcli._parseVolumeInfo(out) - for volumeName in volumeInfo: - if volumeName == 'music': - self.assertEquals(volumeInfo['music']['volumeName'], - volumeName) - self.assertEquals(volumeInfo['music']['uuid'], - '1e7d2638-fb77-4325-94fd-3242650a013c') - self.assertEquals(volumeInfo['music']['volumeType'], - 'DISTRIBUTE') - self.assertEquals(volumeInfo['music']['volumeStatus'], - 'STOPPED') - self.assertEquals(volumeInfo['music']['transportType'], - ['TCP']) - self.assertEquals(volumeInfo['music']['bricks'], - ['192.168.122.167:/tmp/music-b1', - '192.168.122.167:/tmp/music-b2']) - self.assertEquals(volumeInfo['music']['brickCount'], '2') - self.assertEquals(volumeInfo['music']['options'], - {'auth.allow': '*'}) + out = """<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<cliOutput> + <opRet>0</opRet> + <opErrno>0</opErrno> + <opErrstr/> + <volInfo> + <volumes> + <volume> + <name>music</name> + <id>b3114c71-741b-4c6f-a39e-80384c4ea3cf</id> + <type>2</type> + <status>1</status> + <brickCount>2</brickCount> + <distCount>2</distCount> + <stripeCount>1</stripeCount> + <replicaCount>2</replicaCount> + <transport>0</transport> + <bricks> + <brick>192.168.122.2:/tmp/music-b1</brick> + <brick>192.168.122.2:/tmp/music-b2</brick> + </bricks> + <optCount>1</optCount> + <options> + <option> + <name>auth.allow</name> + <value>*</value> + </option> + </options> + </volume> + <volume> + <name>test1</name> + <id>2e562614-00ad-4acb-a630-4429049a9818</id> + <type>0</type> + <status>2</status> + <brickCount>2</brickCount> + <distCount>1</distCount> + <stripeCount>1</stripeCount> + <replicaCount>1</replicaCount> + <transport>1</transport> + <bricks> + <brick>192.168.122.2:/tmp/test1-b1</brick> + <brick>192.168.122.2:/tmp/test1-b2</brick> + </bricks> + <optCount>0</optCount> + <options/> + </volume> + <count>2</count> + </volumes> + </volInfo> +</cliOutput> +""" + tree = etree.fromstring(out) + oVolumeInfo = {'music': + {'brickCount': '2', + 'bricks': ['192.168.122.2:/tmp/music-b1', + '192.168.122.2:/tmp/music-b2'], + 'distCount': '2', + 'options': {'auth.allow': '*'}, + 'replicaCount': '2', + 'stripeCount': '1', + 'transportType': [gcli.TransportType.TCP], + 'uuid': 'b3114c71-741b-4c6f-a39e-80384c4ea3cf', + 'volumeName': 'music', + 'volumeStatus': gcli.VolumeStatus.ONLINE, + 'volumeType': '2'}, + 'test1': + {'brickCount': '2', + 'bricks': ['192.168.122.2:/tmp/test1-b1', + '192.168.122.2:/tmp/test1-b2'], + 'distCount': '1', + 'options': {}, + 'replicaCount': '1', + 'stripeCount': '1', + 'transportType': [gcli.TransportType.RDMA], + 'uuid': '2e562614-00ad-4acb-a630-4429049a9818', + 'volumeName': 'test1', + 'volumeStatus': gcli.VolumeStatus.OFFLINE, + 'volumeType': '0'}} + volumeInfo = gcli._parseVolumeInfo(tree) + self.assertEquals(volumeInfo, oVolumeInfo) def test_parseVolumeInfo(self): self._parseVolumeInfo_empty_test() diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py index ba1f374..3c1bc58 100644 --- a/vdsm/gluster/api.py +++ b/vdsm/gluster/api.py @@ -42,11 +42,6 @@ return wrapper -class VolumeStatus(): - ONLINE = 'ONLINE' - OFFLINE = 'OFFLINE' - - class GlusterApi(object): """ The gluster interface of vdsm. @@ -120,35 +115,14 @@ @exportAsVerb def volumesList(self, volumeName=None, options=None): - """ - Returns: - {'status' : {'code': CODE, 'message': MESSAGE}, - 'volumes': {VOLUMENAME: {'brickCount': BRICKCOUNT, - 'bricks': [BRICK1, BRICK2, ...], - 'options': {OPTION: VALUE, ...}, - 'transportType': [TCP, RDMA, ...], - 'uuid': UUID, - 'volumeName': NAME, - 'volumeStatus': STATUS, - 'volumeType': TYPE}, ...}} - """ - volumeInfoDict = self.svdsmProxy.glusterVolumeInfo(volumeName) - for name, info in volumeInfoDict.iteritems(): - info["volumeType"] = info["volumeType"].replace("-", "_") - if info["volumeStatus"] == "STARTED": - info["volumeStatus"] = VolumeStatus.ONLINE - else: - info["volumeStatus"] = VolumeStatus.OFFLINE - return {'volumes': volumeInfoDict} + return {'volumes': self.svdsmProxy.glusterVolumeInfo(volumeName)} @exportAsVerb def volumeCreate(self, volumeName, brickList, replicaCount=0, stripeCount=0, transportList=[], options=None): - self.svdsmProxy.glusterVolumeCreate(volumeName, brickList, - replicaCount, stripeCount, - transportList) - volumeList = self.svdsmProxy.glusterVolumeInfo() - return {'uuid': volumeList[volumeName]['uuid']} + return self.svdsmProxy.glusterVolumeCreate(volumeName, brickList, + replicaCount, stripeCount, + transportList) @exportAsVerb def volumeStart(self, volumeName, force=False, options=None): diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py index e31c3f4..2ead7c9 100644 --- a/vdsm/gluster/cli.py +++ b/vdsm/gluster/cli.py @@ -18,7 +18,6 @@ # Refer to the README and COPYING files for full details of the license # -import re import xml.etree.cElementTree as etree from functools import wraps @@ -30,7 +29,6 @@ _glusterCommandPath = utils.CommandPath("gluster", "/usr/sbin/gluster", ) -_brickCountRegEx = re.compile('(\d+) x (\d+) = (\d+)') def _getGlusterVolCmd(): @@ -74,6 +72,16 @@ RUNNING = 'RUNNING' FAILED = 'FAILED' COMPLETED = 'COMPLETED' + + +class VolumeStatus: + ONLINE = 'ONLINE' + OFFLINE = 'OFFLINE' + + +class TransportType: + TCP = 'TCP' + RDMA = 'RDMA' def _execGluster(cmd): @@ -354,76 +362,47 @@ raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) -def _parseVolumeInfo(out): - if not out[0].strip(): - del out[0] - if out[-1].strip(): - out += [""] - - if out[0].strip().upper() == "NO VOLUMES PRESENT": - return {} - - volumeInfoDict = {} - volumeInfo = {} - volumeName = None - brickList = [] - volumeOptions = {} - for line in out: - line = line.strip() - if not line: - if volumeName and volumeInfo: - volumeInfo["bricks"] = brickList - volumeInfo["options"] = volumeOptions - volumeInfoDict[volumeName] = volumeInfo - volumeInfo = {} - volumeName = None - brickList = [] - volumeOptions = {} - continue - - tokens = line.split(":", 1) - key = tokens[0].strip().upper() - if key == "BRICKS": - continue - elif key == "OPTIONS RECONFIGURED": - continue - elif key == "VOLUME NAME": - volumeName = tokens[1].strip() - volumeInfo["volumeName"] = volumeName - elif key == "VOLUME ID": - volumeInfo["uuid"] = tokens[1].strip() - elif key == "TYPE": - volumeInfo["volumeType"] = tokens[1].strip().upper() - elif key == "STATUS": - volumeInfo["volumeStatus"] = tokens[1].strip().upper() - elif key == "TRANSPORT-TYPE": - volumeInfo["transportType"] = tokens[1].strip().upper().split(',') - elif key.startswith("BRICK"): - brickList.append(tokens[1].strip()) - elif key == "NUMBER OF BRICKS": - volumeInfo["brickCount"] = tokens[1].strip() +def _parseVolumeInfo(tree): + """ + {VOLUMENAME: {'brickCount': BRICKCOUNT, + 'bricks': [BRICK1, BRICK2, ...], + 'options': {OPTION: VALUE, ...}, + 'transportType': [TCP,RDMA, ...], + 'uuid': UUID, + 'volumeName': NAME, + 'volumeStatus': STATUS, + 'volumeType': TYPE}, ...} + """ + volumes = {} + for el in tree.findall('volInfo/volumes/volume'): + value = {} + value['volumeName'] = el.find('name').text + value['uuid'] = el.find('id').text + value['volumeType'] = el.find('type').text + status = el.find('status').text + if status == '1': + value["volumeStatus"] = VolumeStatus.ONLINE else: - volumeOptions[tokens[0].strip()] = tokens[1].strip() - - for volumeName, volumeInfo in volumeInfoDict.iteritems(): - if volumeInfo["volumeType"] == "REPLICATE": - volumeInfo["replicaCount"] = volumeInfo["brickCount"] - elif volumeInfo["volumeType"] == "STRIPE": - volumeInfo["stripeCount"] = volumeInfo["brickCount"] - elif volumeInfo["volumeType"] == "DISTRIBUTED-REPLICATE": - m = _brickCountRegEx.match(volumeInfo["brickCount"]) - if m: - volumeInfo["replicaCount"] = m.groups()[1] - else: - volumeInfo["replicaCount"] = "" - - elif volumeInfo["volumeType"] == "DISTRIBUTED-STRIPE": - m = _brickCountRegEx.match(volumeInfo["brickCount"]) - if m: - volumeInfo["stripeCount"] = m.groups()[1] - else: - volumeInfo["stripeCount"] = "" - return volumeInfoDict + value["volumeStatus"] = VolumeStatus.OFFLINE + value['brickCount'] = el.find('brickCount').text + value['distCount'] = el.find('distCount').text + value['stripeCount'] = el.find('stripeCount').text + value['replicaCount'] = el.find('replicaCount').text + transportType = el.find('transport').text + if transportType == '0': + value['transportType'] = [TransportType.TCP] + elif transportType == '1': + value['transportType'] = [TransportType.RDMA] + else: + value['transportType'] = [TransportType.TCP, TransportType.RDMA] + value['bricks'] = [] + value['options'] = {} + for b in el.findall('bricks/brick'): + value['bricks'].append(b.text) + for o in el.findall('options/option'): + value['options'][o.find('name').text] = o.find('value').text + volumes[value['volumeName']] = value + return volumes @exportToSuperVdsm @@ -442,11 +421,14 @@ command = _getGlusterVolCmd() + ["info"] if volumeName: command.append(volumeName) - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumesListFailedException(rc, out, err) - else: - return _parseVolumeInfo(out) + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumesListFailedException(rc=e.rc, err=e.err) + try: + return _parseVolumeInfo(xmltree) + except (etree.ParseError, AttributeError, ValueError): + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) @exportToSuperVdsm @@ -460,12 +442,14 @@ if transportList: command += ["transport", ','.join(transportList)] command += brickList - - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumeCreateFailedException(rc, out, err) - else: - return True + try: + xmltree = _execGlusterXml(command) + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeCreateFailedException(rc=e.rc, err=e.err) + try: + return {'uuid': xmltree.find('id').text} + except (etree.ParseError, AttributeError, ValueError): + raise ge.GlusterXmlErrorException(err=[etree.tostring(xmltree)]) @exportToSuperVdsm @@ -473,11 +457,11 @@ command = _getGlusterVolCmd() + ["start", volumeName] if force: command.append('force') - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumeStartFailedException(rc, out, err) - else: + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeStartFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm @@ -485,30 +469,31 @@ command = _getGlusterVolCmd() + ["stop", volumeName] if force: command.append('force') - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumeStopFailedException(rc, out, err) - else: + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeStopFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm def volumeDelete(volumeName): - rc, out, err = _execGluster(_getGlusterVolCmd() + ["delete", volumeName]) - if rc: - raise ge.GlusterVolumeDeleteFailedException(rc, out, err) - else: + command = _getGlusterVolCmd() + ["delete", volumeName] + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeDeleteFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm def volumeSet(volumeName, option, value): - rc, out, err = _execGluster(_getGlusterVolCmd() + ["set", volumeName, - option, value]) - if rc: - raise ge.GlusterVolumeSetFailedException(rc, out, err) - else: + command = _getGlusterVolCmd() + ["set", volumeName, option, value] + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeSetFailedException(rc=e.rc, err=e.err) def _parseVolumeSetHelpXml(out): @@ -538,11 +523,11 @@ command.append(option) if force: command.append('force') - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumeResetFailedException(rc, out, err) - else: + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeResetFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm @@ -554,12 +539,11 @@ if replicaCount: command += ["replica", "%s" % replicaCount] command += brickList - - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterVolumeBrickAddFailedException(rc, out, err) - else: + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterVolumeBrickAddFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm @@ -820,11 +804,12 @@ @exportToSuperVdsm def peerProbe(hostName): - rc, out, err = _execGluster(_getGlusterPeerCmd() + ["probe", hostName]) - if rc: - raise ge.GlusterHostAddFailedException(rc, out, err) - else: + command = _getGlusterPeerCmd() + ["probe", hostName] + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterHostAddFailedException(rc=e.rc, err=e.err) @exportToSuperVdsm @@ -832,11 +817,11 @@ command = _getGlusterPeerCmd() + ["detach", hostName] if force: command.append('force') - rc, out, err = _execGluster(command) - if rc: - raise ge.GlusterHostRemoveFailedException(rc, out, err) - else: + try: + _execGlusterXml(command) return True + except ge.GlusterCmdFailedException, e: + raise ge.GlusterHostRemoveFailedException(rc=e.rc, err=e.err) def _parsePeerStatus(tree, gHostName, gUuid, gStatus): -- To view, visit http://gerrit.ovirt.org/7951 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I364930675dcc433dfc0432a343fc66e91721e801 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Bala.FA <barumuga(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Timothy Asir <tjeyasin(a)redhat.com>

4 15

Change in vdsm[master]: drop type() call
by Dan Kenigsberg 19 Nov '12

19 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: drop type() call ...................................................................... drop type() call Python method resolution knows to find class methods as it is. Change-Id: Ifd37f580c392412159cc7641336074d8894bd501 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/imageRepository/formatConverter.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/8816/1 diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index d118e87..422cb39 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -149,7 +149,7 @@ log.debug("Creating the volume lease for %s", volUUID) metaId = vol.getMetadataId() - type(vol).newVolumeLease(metaId, domain.sdUUID, volUUID) + vol.newVolumeLease(metaId, domain.sdUUID, volUUID) # If this volume is used as a template let's update the other # volume's permissions and share the volume lease (at the moment -- To view, visit http://gerrit.ovirt.org/8816 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd37f580c392412159cc7641336074d8894bd501 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 9

Change in vdsm[master]: add VM creation test over localfs storage layout
by zhshzhou＠linux.vnet.ibm.com 19 Nov '12

19 Nov '12

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 <zhshzhou(a)linux.vnet.ibm.com> --- 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 <zhshzhou(a)linux.vnet.ibm.com>

4 14

Change in vdsm[master]: extract a method for booting a test VM through kernel boot
by zhshzhou＠linux.vnet.ibm.com 19 Nov '12

19 Nov '12

Zhou Zheng Sheng has uploaded a new change for review. Change subject: extract a method for booting a test VM through kernel boot ...................................................................... extract a method for booting a test VM through kernel boot Hide the kernel boot and initramfs details into a method, then just call the metthod with ordinary VM configurations Change-Id: I6f2e94651d0279b19b1ce6849fb6f0c1b530a10c Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M tests/functional/xmlrpcTests.py 1 file changed, 23 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/8414/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index 2968061..91376ed 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -190,32 +190,36 @@ def testStartSmallVM(self): self.skipNoKVM() - def assertVMAndGuestUp(): - self.assertVmUp(VMID) - self.assertGuestUp(VMID) + conf = {'display': 'vnc', + 'kvmEnable': 'true', + 'memSize': '256', + 'vmId': '77777777-ffff-3333-bbbb-222222222222', + 'vmName': 'vdsm_testSmallVM', + 'vmType': 'kvm'} - VMID = '77777777-ffff-3333-bbbb-222222222222' + self._runVMKernelBoot(conf) + + def _runVMKernelBoot(self, vmDef): + vmid = vmDef['vmId'] + + def assertVMAndGuestUp(): + self.assertVmUp(vmid) + self.assertGuestUp(vmid) with kernelBootImages() as (kernelPath, initramfsPath): - 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'}) 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) -- To view, visit http://gerrit.ovirt.org/8414 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f2e94651d0279b19b1ce6849fb6f0c1b530a10c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

7 26

← Newer
1
...
19
20
21
22
23
24
25
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2012