some changes

diff --git a/exec/xenrt/lib/xenserver/guest.py b/exec/xenrt/lib/xenserver/guest.py
index 9085e0bef448164ca83be8805c676a6af9022d90..a93fb39c82502cef6db60582ea03695302874997 100755 (executable)
--- a/exec/xenrt/lib/xenserver/guest.py
+++ b/exec/xenrt/lib/xenserver/guest.py
@@ -368,12 +368,11 @@ class Guest(xenrt.GenericGuest):
                                      "(arch %s)" % (distro, arch))
 
         self.isoname = isoname
-      # if self.memory and self.isoname and ([i for i in ["win81","ws12r2","win10"] if i in self.isoname]):
-        if self.memory and self.isoname and ((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK")) in self.isoname):
+        if self.memory and self.isoname and ([i for i in ["win81","ws12r2","win10"] if i in self.isoname]):
             if rootdisk == self.DEFAULT:
-                rootdisk = max((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK")),(xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK_MEMORY_DIFF")) + self.memory)
+                rootdisk = max((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.isoname,"MIN_ROOTDISK")),(xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.isoname,"MIN_ROOTDISK_MEMORY_DIFF")) + self.memory)
             else:
-                rootdisk = max((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK")),(xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK_MEMORY_DIFF")) + self.memory, rootdisk)
+                rootdisk = max((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.isoname,"MIN_ROOTDISK")),(xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.isoname,"MIN_ROOTDISK_MEMORY_DIFF")) + self.memory, rootdisk)
             xenrt.TEC().logverbose("Increasing root disk to %d" % rootdisk)
 
         if distro: