Author: gnichols Date: 2010-01-12 16:03:31 +0000 (Tue, 12 Jan 2010) New Revision: 284

Modified: trunk/v7/environment.py Log: 523824 - FEAT: v7 should fv_* tests should support KVM

Modified: trunk/v7/environment.py =================================================================== --- trunk/v7/environment.py 2010-01-12 16:03:10 UTC (rev 283) +++ trunk/v7/environment.py 2010-01-12 16:03:31 UTC (rev 284) @@ -35,7 +35,9 @@ self.defaultLibraryDirectory = "/usr/share/v7/lib" self.defaultLogDirectory = "/var/log/v7" self.defaultGuestImageDirectory = '/var/lib/xen/images' + self.defaultKVMGuestImageDirectory = self.defaultDataDirectory self.defaultGuestConfigDirectory = '/etc/xen' + self.defaultKVMGuestConfigDirectory = '/etc/libvirt/qemu' self.defaultGuestBootDirectory = '/usr/lib/xen/boot/' self.defaultPartnerServerURL = "ftp://partners.redhat.com/a166eabc5cf5df158922f9b06e5e7b21/hwcert/" self.defaultMaximumAttachmentFileSize = 64 * 1048576 # 64 MB @@ -68,8 +70,12 @@ self.setTextNode(element, self.defaultLogDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_image_directory) self.setTextNode(element, self.defaultGuestImageDirectory) + element = self.findOrCreateElement(filesystemElement, Tags.kvm_guest_image_directory) + self.setTextNode(element, self.defaultKVMGuestImageDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_config_directory) self.setTextNode(element, self.defaultGuestConfigDirectory) + element = self.findOrCreateElement(filesystemElement, Tags.kvm_guest_config_directory) + self.setTextNode(element, self.defaultKVMGuestConfigDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_boot_directory) self.setTextNode(element, self.defaultGuestBootDirectory) element = self.findOrCreateElement(urlElement, Tags.partner_server) @@ -113,9 +119,23 @@ guestImageElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_image_directory) return self.getTextNode(guestImageElement).data

+ def getKVMGuestImageDirectory(self): + guestImageElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.kvm_guest_image_directory) + if not self.getTextNode(guestImageElement): + self.setTextNode(guestImageElement, self.defaultKVMGuestImageDirectory) + self.save(self.environmentFile) + return self.getTextNode(guestImageElement).data + def getGuestConfigDirectory(self): guestConfigElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_config_directory) return self.getTextNode(guestConfigElement).data + + def getKVMGuestConfigDirectory(self): + guestConfigElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.kvm_guest_config_directory) + if not self.getTextNode(guestConfigElement): + self.setTextNode(guestConfigElement, self.defaultKVMGuestConfigDirectory) + self.save(self.environmentFile) + return self.getTextNode(guestConfigElement).data

def getGuestBootDirectory(self): guestBootElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_boot_directory)