Added generic code

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index 230ca0189af3dea0b60def47f8562acfdb309ddb..377f3991b4648b82d6bb136e4e833f3ebc932334 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -2101,21 +2101,29 @@ class Config(object):
         self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAXMEMORY"] = "131072"
         self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAXSOCKETS"] = "2"
         self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAX_VM_VCPUS"] = "16"
+        self.config["GUEST_LIMITATIONS"]["win10-x86"]["MIN_ROOTDISK"] = "32768" 
+        self.config["GUEST_LIMITATIONS"]["win10-x86"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
         self.config["GUEST_LIMITATIONS"]["win10-x64"] = {}
         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MINMEMORY"] = "2048"
         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAXMEMORY"] = "131072"
         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAXSOCKETS"] = "2"
         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAX_VM_VCPUS"] = "16"
+        self.config["GUEST_LIMITATIONS"]["win10-x64"]["MIN_ROOTDISK"] = "32768" 
+        self.config["GUEST_LIMITATIONS"]["win10-x64"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
         self.config["GUEST_LIMITATIONS"]["win81-x86"] = {}
         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MINMEMORY"] = "1024"
         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAXMEMORY"] = "131072"
         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAXSOCKETS"] = "2"
         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAX_VM_VCPUS"] = "16"
+        self.config["GUEST_LIMITATIONS"]["win81-x86"]["MIN_ROOTDISK"] = "32768" 
+        self.config["GUEST_LIMITATIONS"]["win81-x86"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
         self.config["GUEST_LIMITATIONS"]["win81-x64"] = {}
         self.config["GUEST_LIMITATIONS"]["win81-x64"]["MINMEMORY"] = "2048"
         self.config["GUEST_LIMITATIONS"]["win81-x64"]["MAXMEMORY"] = "131072"
         self.config["GUEST_LIMITATIONS"]["win81-x64"]["MAXSOCKETS"] = "2"
         self.config["GUEST_LIMITATIONS"]["win81-x64"]["MAX_VM_VCPUS"] = "16"
+        self.config["GUEST_LIMITATIONS"]["win81-x64"]["MIN_ROOTDISK"] = "32768" 
+        self.config["GUEST_LIMITATIONS"]["win81-x64"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
         self.config["GUEST_LIMITATIONS"]["ws12-x64"] = {}
         self.config["GUEST_LIMITATIONS"]["ws12-x64"]["MINMEMORY"] = "1024"
         self.config["GUEST_LIMITATIONS"]["ws12-x64"]["MAXMEMORY"] = "524288"
@@ -2131,6 +2139,8 @@ class Config(object):
         self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAXMEMORY"] = "524288"
         self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAXSOCKETS"] = "64"
         self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAX_VM_VCPUS"] = "16"
+        self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MIN_ROOTDISK"] = "32768" 
+        self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
         self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"] = {}
         self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MINMEMORY"] = "2048"
         self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MAXMEMORY"] = "524288"

diff --git a/exec/xenrt/lib/xenserver/guest.py b/exec/xenrt/lib/xenserver/guest.py
index b023d7f8c5484b25dcc9f0e64335dfc3ee048382..9085e0bef448164ca83be8805c676a6af9022d90 100755 (executable)
--- a/exec/xenrt/lib/xenserver/guest.py
+++ b/exec/xenrt/lib/xenserver/guest.py
@@ -368,11 +368,12 @@ 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 ([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 rootdisk == self.DEFAULT:
-                rootdisk = max(32768, 20480 + self.memory)
+                rootdisk = max((xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK")),(xenrt.TEC().lookup(["GUEST_LIMITATIONS"],self.DISTRO,"MIN_ROOTDISK_MEMORY_DIFF")) + self.memory)
             else:
-                rootdisk = max(32768, 20480 + self.memory, rootdisk)
+                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)
             xenrt.TEC().logverbose("Increasing root disk to %d" % rootdisk)
 
         if distro: