Upped max mem for Dundee

diff --git a/data/config/GUEST_LIMITATIONS.json b/data/config/GUEST_LIMITATIONS.json
index 4a424d60b2289ed6511fe8183e8a32dc33a72ddd..e2e49334ef6b112a15c9f4131edd508e439407b6 100644 (file)
--- a/data/config/GUEST_LIMITATIONS.json
+++ b/data/config/GUEST_LIMITATIONS.json
@@ -155,14 +155,14 @@
     },
     "debian80": {
       "MAXMEMORY": "65536",
-      "MAXMEMORY64": "131072",
+      "MAXMEMORY64": "16777216",
       "MAX_VM_VCPUS": "32",
       "MAX_VM_VCPUS64": "32",
       "MINMEMORY": "256",
     },
     "debiantesting": {
       "MAXMEMORY": "65536",
-      "MAXMEMORY64": "131072",
+      "MAXMEMORY64": "16777216",
       "MAX_VM_VCPUS": "32",
       "MAX_VM_VCPUS64": "32",
       "MINMEMORY": "256",
@@ -257,12 +257,12 @@
       "MINMEMORY": "512"
     },
     "oel7": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
     "oel71": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
@@ -382,12 +382,12 @@
       "MINMEMORY": "1024",
     },
     "rhel7": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
     "rhel71": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
@@ -416,12 +416,12 @@
       "MINMEMORY": "1024"
     },
     "sl7": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
     "sl71": {
-      "MAXMEMORY64": "6291456",
+      "MAXMEMORY64": "4194304",
       "MAX_VM_VCPUS64": "240",
       "MINMEMORY": "1024"
     },
@@ -490,7 +490,7 @@
     },
     "sles12": {
       "MAXMEMORY": "16384",
-      "MAXMEMORY64": "524288",
+      "MAXMEMORY64": "67108864",
       "MINMEMORY": "4096",
     },
     "sles92": {
@@ -526,14 +526,14 @@
     },
     "ubuntu1404": {
       "MAXMEMORY": "65536",
-      "MAXMEMORY64": "131072",
+      "MAXMEMORY64": "16777216",
       "MAX_VM_VCPUS": "8",
       "MAX_VM_VCPUS64": "16",
       "MINMEMORY": "512"
     },
     "ubuntudevel": {
       "MAXMEMORY": "32768",
-      "MAXMEMORY64": "131072",
+      "MAXMEMORY64": "16777216",
       "MAX_VM_VCPUS": "8",
       "MAX_VM_VCPUS64": "16",
       "MINMEMORY": "256"
@@ -653,7 +653,7 @@
       "MINMEMORY": "128"
     },
     "win10-x64": {
-      "MAXMEMORY": "131072",
+      "MAXMEMORY": "2097152",
       "MAXSOCKETS": "2",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "2048",
@@ -693,7 +693,7 @@
       "MINMEMORY": "1024"
     },
     "win8-x64": {
-      "MAXMEMORY": "131072",
+      "MAXMEMORY": "524288",
       "MAXSOCKETS": "2",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "2048"
@@ -705,7 +705,7 @@
       "MINMEMORY": "1024"
     },
     "win81-x64": {
-      "MAXMEMORY": "131072",
+      "MAXMEMORY": "524288",
       "MAXSOCKETS": "2",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "2048",
@@ -801,19 +801,19 @@
       "MINMEMORY": "512"
     },
     "ws12-x64": {
-      "MAXMEMORY": "524288",
+      "MAXMEMORY": "4194304",
       "MAXSOCKETS": "64",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "1024"
     },
     "ws12core-x64": {
-      "MAXMEMORY": "524288",
+      "MAXMEMORY": "4194304",
       "MAXSOCKETS": "64",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "2048"
     },
     "ws12r2-x64": {
-      "MAXMEMORY": "524288",
+      "MAXMEMORY": "4194304",
       "MAXSOCKETS": "64",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "1024",
@@ -821,7 +821,7 @@
       "MIN_ROOTDISK_MEMORY_DIFF": "20480"
     },
     "ws12r2core-x64": {
-      "MAXMEMORY": "524288",
+      "MAXMEMORY": "4194304",
       "MAXSOCKETS": "64",
       "MAX_VM_VCPUS": "16",
       "MINMEMORY": "2048"

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index 85f6cb049c6a94bafa53b31e1c9be17c7befec44..e1b04b79ef8528c198a480380eab72ec727405dc 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -1203,6 +1203,7 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_SLED_12_64"] = "SUSE Linux Enterprise Desktop 12 (64-bit)"
         self.config["VERSION_CONFIG"]["Dundee"]["MAX_VBDS_PER_HOST"] = "4096"
         self.config["VERSION_CONFIG"]["Dundee"]["MAX_VDIS_PER_VM"] = "255"
+        self.config["VERSION_CONFIG"]["Dundee"]["MAX_MEM_HVM"] = "2097152"
 
         # XenServer dom0 partitions
         self.config["VERSION_CONFIG"]["Dundee"]["DOM0_PARTITIONS"] = {1:18*xenrt.GIGA, 2:18*xenrt.GIGA, 3:"*", 4:512*xenrt.MEGA, 5:4*xenrt.GIGA, 6:1024*xenrt.MEGA}
@@ -3331,15 +3332,21 @@ class Config(object):
         for r in self.config["GUEST_TESTS"].keys():
             for g in self.config["GUEST_TESTS"][r].keys():
                 self.config["GUEST_TESTS"][r]["%s_32BitPV" % g] = []
+                self.config["GUEST_TESTS"][r]["%s_64BitHVM" % g] = []
                 self.config["GUEST_TESTS"][r]["%s_Not32BitPV" % g] = []
+                self.config["GUEST_TESTS"][r]["%s_Not32BitPVOr64BitHVM" % g] = []
                 self.config["GUEST_TESTS"][r]["%s_LinuxISOInstall" % g] = []
                 self.config["GUEST_TESTS"][r]["%s_LinuxHTTPInstall" % g] = []
                 self.config["GUEST_TESTS"][r]["%s_LinuxNFSInstall" % g] = []
                 for d in self.config['GUEST_TESTS'][r][g]:
-                    if xenrt.is32BitPV(d, release=r, config=self):
+                    if not xenrt.is32BitPV(d, release=r, config=self):
+                        self.config["GUEST_TESTS"][r]["%s_Not32BitPV" % g].append(d)
+                    if xenrt.is64BitHVM(d, release=r, config=self):
+                        self.config["GUEST_TESTS"][r]["%s_64BitHVM" % g].append(d)
+                    elif xenrt.is32BitPV(d, release=r, config=self):
                         self.config["GUEST_TESTS"][r]["%s_32BitPV" % g].append(d)
                     else:
-                        self.config["GUEST_TESTS"][r]["%s_Not32BitPV" % g].append(d)
+                        self.config["GUEST_TESTS"][r]["%s_Not32BitPVOr64BitHVM" % g].append(d)
                     if not xenrt.isWindows(d):
                         if not [x for x in noIsoInstallSupport if re.match(x, d)]:
                             self.config["GUEST_TESTS"][r]["%s_LinuxISOInstall" % g].append(d)

diff --git a/exec/xenrt/util.py b/exec/xenrt/util.py
index 95dcc13aa9eb68cabac71ee47568bbc9850669c0..96d62aa4bd1db462e36c3ad2f857f06e47a4f737 100755 (executable)
--- a/exec/xenrt/util.py
+++ b/exec/xenrt/util.py
@@ -94,6 +94,7 @@ __all__ = ["timenow",
            "isWindows",
            "isDevLinux",
            "is32BitPV",
+           "is64BitHVM",
            "checkXMLDomSubset",
            "getUpdateDistro",
            "getLinuxRepo",
@@ -1592,6 +1593,25 @@ def is32BitPV(distro, arch=None, release=None, config=None):
     # We've got this far, so it must be 32 bitPV
     return True
 
+def is64BitHVM(distro, arch=None, release=None, config=None):
+    if not arch:
+        (distro, arch) = getDistroAndArch(distro)
+
+    if arch != "x86-64":
+        return False
+        
+    # Windows isn't PV
+    if isWindows(distro):
+        return True
+
+    if not config:
+        config = xenrt.TEC()
+
+    if release and distro in config.lookup(["VERSION_CONFIG", release, "HVM_LINUX"], "").split(","):
+        return True
+
+    return False
+
 def checkXMLDomSubset(superset, subset):
     if subset.localName != superset.localName:
         return False

diff --git a/seqs/dundeeVMMaxMem64BitHVMPrimary.seq b/seqs/dundeeVMMaxMem64BitHVMPrimary.seq
new file mode 100644 (file)
index 0000000..be041b5
--- /dev/null
+++ b/seqs/dundeeVMMaxMem64BitHVMPrimary.seq
@@ -0,0 +1,12 @@
+<xenrt>
+  <prepare>
+    <host/>
+  </prepare>
+  <testsequence>
+    <parallel group="MaxMem" workers="1">
+      <for iter="D" values="%GUEST_TESTS:Dundee:Primary_64BitHVM%" > 
+        <testcase id="xenserver.tc.smoketest.TCSmokeTestMaxMem" name="${D}" sku="${D}" />
+      </for>
+    </parallel>
+  </testsequence>
+</xenrt>

diff --git a/seqs/dundeeVMMaxMemPrimary.seq b/seqs/dundeeVMMaxMemPrimary.seq
index d0d67bcb7cdc46ba58c3697346c9bfcc8039da22..e55258068030b760b3db59e2f9b63da0ce81ccbf 100644 (file)
--- a/seqs/dundeeVMMaxMemPrimary.seq
+++ b/seqs/dundeeVMMaxMemPrimary.seq
@@ -8,7 +8,7 @@
   </prepare>
   <testsequence>
     <parallel group="MaxMem" workers="1">
-      <for iter="D" values="%GUEST_TESTS:Dundee:Primary_Not32BitPV%" limit="%LIMIT%" offset="%OFFSET%"> 
+      <for iter="D" values="%GUEST_TESTS:Dundee:Primary_Not32BitPVOr64BitHVM%" limit="%LIMIT%" offset="%OFFSET%"> 
         <testcase id="xenserver.tc.smoketest.TCSmokeTestMaxMem" name="${D}" sku="${D}" />
       </for>
     </parallel>