Max mem tidy up

diff --git a/data/config/VM_MEMORY.json b/data/config/VM_MEMORY.json
index 0c5b31f0949704c10a247b48d2824075139e7ae8..d89e866ca2062aa0c8f7ca4ab28245ed11d83ce0 100644 (file)
--- a/data/config/VM_MEMORY.json
+++ b/data/config/VM_MEMORY.json
@@ -16,56 +16,67 @@
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "BostonXCP": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Sanibel": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "SanibelCC": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Tampa": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "TampaXCP": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Tallahassee": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Clearwater": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Creedence": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Cream": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "131072",
     },
     "Dundee": {
       "MIN_VM_MEMORY": "128",
       "MAX_VM_MEMORY": "131072",
       "MAX_VM_MEMORY_LINUX32BIT": "65536",
+      "MAX_VM_MEMORY_HVM": "1572864",
     }
   }
 }

diff --git a/exec/testcases/xenserver/tc/maxima.py b/exec/testcases/xenserver/tc/maxima.py
index 9aca63bff9b68487c0de9b48eb75e52d46c4b015..c73d9e20afb061a758cdc5e6e6eda89a7e4ec5bc 100755 (executable)
--- a/exec/testcases/xenserver/tc/maxima.py
+++ b/exec/testcases/xenserver/tc/maxima.py
@@ -8,84 +8,6 @@ import socket, re, string, time, traceback, sys, random, copy, math
 import xenrt, xenrt.lib.xenserver
 from xenrt.lazylog import log
 
-class _MaxMemory(xenrt.TestCase):
-    """Base class for maximum memory per VM test"""
-    MEMORY = 131072
-    VM_TYPE = "HVM"
-    ARCH = "x86-64"
-    DISTRO = ""
-    
-    def prepare(self, arglist=None):
-        # Get a host to install on
-        host = self.getDefaultHost()
-        self.FREE_MEMORY = host.getFreeMemory()
-        if self.MEMORY > self.FREE_MEMORY:
-            raise xenrt.XRTError("Not enough free memory on host")
-        if self.MEMORY == True:
-            #self.MEMORY = int(host.lookup("MAX_MEM_%s" % (self.VM_TYPE)))
-            self.MEMORY = int(xenrt.TEC().lookup(["VERSION_CONFIG",xenrt.TEC().lookup("PRODUCT_VERSION"),"MAX_MEM_%s" % (self.VM_TYPE)]))
-        # Install the VM
-        xenrt.TEC().logverbose("Installing VM...")
-        self.installVM(host)
-        self.uninstallOnCleanup(self.guest)
-        xenrt.TEC().logverbose("...VM installed successfully")
-        
-    def run(self, arglist=None):
-        """Do testing tasks in run"""
-        xenrt.TEC().logverbose("Setting VM memory to maximum value")
-        xenrt.TEC().logverbose("Shutdown VM")
-        self.guest.shutdown()
-        xenrt.TEC().logverbose("Set VM memory to maximum value")
-        self.guest.memset(self.MEMORY)
-        xenrt.TEC().logverbose("Starting guest...")
-        self.guest.start()
-        xenrt.TEC().logverbose("...Started")
-        # Perform some lifecycle operations
-        if self.runSubcase("lifecycleOperations", (), "LifecycleOperations", "LifecycleOperations") != \
-            xenrt.RESULT_PASS:
-            return
-        #check memory of VM
-        if self.guest.memget() != self.MEMORY:
-            raise xenrt.XRTFailure("Memory of guest is not equal to memory alloted")
-        
-        
-    def lifecycleOperations(self):
-        xenrt.TEC().logverbose("Reboot VM")
-        self.guest.reboot()
-        self.guest.waitForAgent(180)
-        xenrt.TEC().logverbose("Shutdown VM")
-        self.guest.shutdown()
-        xenrt.TEC().logverbose("Start VM")
-        self.guest.start()
-        self.guest.waitForAgent(180)
-        xenrt.TEC().logverbose("Suspend VM")
-        self.guest.suspend(extraTimeout=3600)
-        xenrt.TEC().logverbose("Resume VM")
-        self.guest.resume()  
-    
-    def installVM(self, host):
-        self.guest = host.createBasicGuest(distro=self.DISTRO, arch=self.ARCH)
-
-class TC18839(_MaxMemory):
-    """maximum memory per VM test for HVM VM"""
-    MEMORY = True
-    VM_TYPE = "HVM"
-    DISTRO = "win7-x64"
-
-class TC18840(_MaxMemory):
-    """maximum memory per VM test for PV VM 64-bit"""
-    MEMORY = True
-    VM_TYPE = "PV64"
-    ARCH = "x86-64"
-    DISTRO = "centos62"
-    
-class TC18841(_MaxMemory):
-    """maximum memory per VM test for PV VM 32-bit"""
-    MEMORY = True
-    VM_TYPE = "PV32"
-    ARCH = "x86-32"
-    DISTRO = "oel57"
-
 class TC18836(xenrt.TestCase):
     """TestCase to verify the host can have specified VCPUs"""
     

diff --git a/exec/testcases/xenserver/tc/smoketest.py b/exec/testcases/xenserver/tc/smoketest.py
index af06bf34fb7eeefcba4fd506aab7ac0063316f86..b496f7e5f99085c786a5dcb1a9c02f13b35a7f27 100755 (executable)
--- a/exec/testcases/xenserver/tc/smoketest.py
+++ b/exec/testcases/xenserver/tc/smoketest.py
@@ -332,6 +332,8 @@ class TCSmokeTestMaxMem(_TCSmokeTest):
     def getGuestParams(self):
         if xenrt.is32BitPV(self.distro, self.arch, release=self.host.productVersion):
             hostMaxMem = int(self.host.lookup("MAX_VM_MEMORY_LINUX32BIT"))
+        elif xenrt.is64BitHVM(self.distro, self.arch, release=self.host.productVersion):
+            hostMaxMem = int(self.host.lookup("MAX_VM_MEMORY_HVM"))
         else:
             hostMaxMem = int(self.host.lookup("MAX_VM_MEMORY"))
 

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index a48899afedbc7ccba0e0af1d74ee8531296da361..d3f214536a3ea01b55d2936d27841acce265fd20 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -866,9 +866,6 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Tampa"]["MAX_VDI_SIZE_NFS"] = "2093058"
         self.config["VERSION_CONFIG"]["Tampa"]["MAX_VDI_SIZE_LVM"] = "2097152"
         self.config["VERSION_CONFIG"]["Tampa"]["MAX_CONCURRENT_VMS"] = "150"
-        self.config["VERSION_CONFIG"]["Tampa"]["MAX_MEM_PV64"] = "131072"
-        self.config["VERSION_CONFIG"]["Tampa"]["MAX_MEM_HVM"] = "131072"
-        self.config["VERSION_CONFIG"]["Tampa"]["MAX_MEM_PV32"] = "65536"
         self.config["VERSION_CONFIG"]["Tampa"]["MAX_VCPU_COUNT"] = "900"
         self.config["VERSION_CONFIG"]["Tampa"]["MAX_MULTIPATH_LUN"] = "150"
         self.config["VERSION_CONFIG"]["Tampa"]["CONCURRENT_MAX_MULTIPATH_LUN"] = "75"
@@ -894,9 +891,6 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_VDIS_PER_SR_lvm"] = "512"
         self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_ATTACHED_VDIS_PER_SR_lvm"] = "512"
         self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_CONCURRENT_VMS"] = "150"
-        self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_MEM_PV64"] = "131072"
-        self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_MEM_HVM"] = "131072"
-        self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_MEM_PV32"] = "65536"
         self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_VCPU_COUNT"] = "900"
         self.config["VERSION_CONFIG"]["Tallahassee"]["MAX_MULTIPATH_LUN"] = "150"
         self.config["VERSION_CONFIG"]["Tallahassee"]["CONCURRENT_MAX_MULTIPATH_LUN"] = "75"
@@ -919,9 +913,6 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Clearwater"]["MAX_VDIS_PER_VM"] = "15"
         self.config["VERSION_CONFIG"]["Clearwater"]["MAX_VDI_SIZE_NFS"] = "2093058"
         self.config["VERSION_CONFIG"]["Clearwater"]["MAX_VDI_SIZE_LVM"] = "2093051"
-        self.config["VERSION_CONFIG"]["Clearwater"]["MAX_MEM_PV64"] = "131072"
-        self.config["VERSION_CONFIG"]["Clearwater"]["MAX_MEM_HVM"] = "131072"
-        self.config["VERSION_CONFIG"]["Clearwater"]["MAX_MEM_PV32"] = "65536"
         self.config["VERSION_CONFIG"]["Clearwater"]["MAX_VCPU_COUNT"] = "900"
         self.config["VERSION_CONFIG"]["Clearwater"]["MAX_MULTIPATH_LUN"] = "150"
         self.config["VERSION_CONFIG"]["Clearwater"]["CONCURRENT_MAX_MULTIPATH_LUN"] = "75"
@@ -1161,9 +1152,6 @@ class Config(object):
         self.config["VERSION_CONFIG"]["Creedence"]["MAX_VDIS_PER_VM"] = "15"
         self.config["VERSION_CONFIG"]["Creedence"]["MAX_VDI_SIZE_NFS"] = "2093058"
         self.config["VERSION_CONFIG"]["Creedence"]["MAX_VDI_SIZE_LVM"] = "2093051"
-        self.config["VERSION_CONFIG"]["Creedence"]["MAX_MEM_PV64"] = "131072"
-        self.config["VERSION_CONFIG"]["Creedence"]["MAX_MEM_HVM"] = "131072"
-        self.config["VERSION_CONFIG"]["Creedence"]["MAX_MEM_PV32"] = "65536"
         self.config["VERSION_CONFIG"]["Creedence"]["MAX_VCPU_COUNT"] = "900"
         self.config["VERSION_CONFIG"]["Creedence"]["MAX_MULTIPATH_LUN"] = "150"
         self.config["VERSION_CONFIG"]["Creedence"]["CONCURRENT_MAX_MULTIPATH_LUN"] = "75"
@@ -1203,7 +1191,6 @@ 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"] = "1572864"
 
         # 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}

diff --git a/seqs/clearwaterMemory32bitPV.seq b/seqs/clearwaterMemory32bitPV.seq
deleted file mode 100755 (executable)
index 5b058bd..0000000
--- a/seqs/clearwaterMemory32bitPV.seq
+++ /dev/null
@@ -1,18 +0,0 @@
-<xenrt>
-  <variables>
-    <PRODUCT_VERSION>Clearwater</PRODUCT_VERSION>
-    
-    <PREPARE_WORKERS>2</PREPARE_WORKERS>
-  </variables>
-
-  <prepare>
-    <host id="0"/>
-  </prepare>
-
-  <testsequence>
-    
-    <!--Memory per VM (PV 32bit) , Limit:64GiB-->
-    <testcase id="xenserver.tc.maxima.TC18841"/>
-    
-  </testsequence>
-</xenrt>

diff --git a/seqs/creedenceMemory32bitPV.seq b/seqs/creedenceMemory32bitPV.seq
deleted file mode 100644 (file)
index b4d76f9..0000000
--- a/seqs/creedenceMemory32bitPV.seq
+++ /dev/null
@@ -1,18 +0,0 @@
-<xenrt>
-  <variables>
-    <PRODUCT_VERSION>Creedence</PRODUCT_VERSION>
-    
-    <PREPARE_WORKERS>2</PREPARE_WORKERS>
-  </variables>
-
-  <prepare>
-    <host id="0"/>
-  </prepare>
-
-  <testsequence>
-    
-    <!--Memory per VM (PV 32bit) , Limit:64GiB-->
-    <testcase id="xenserver.tc.maxima.TC18841"/>
-    
-  </testsequence>
-</xenrt>

diff --git a/seqs/dundeeMemory32bitPV.seq b/seqs/dundeeMemory32bitPV.seq
deleted file mode 100644 (file)
index 2a51afc..0000000
--- a/seqs/dundeeMemory32bitPV.seq
+++ /dev/null
@@ -1,18 +0,0 @@
-<xenrt>
-  <variables>
-    <PRODUCT_VERSION>Dundee</PRODUCT_VERSION>
-    
-    <PREPARE_WORKERS>2</PREPARE_WORKERS>
-  </variables>
-
-  <prepare>
-    <host id="0"/>
-  </prepare>
-
-  <testsequence>
-    
-    <!--Memory per VM (PV 32bit) , Limit:64GiB-->
-    <testcase id="xenserver.tc.maxima.TC18841"/>
-    
-  </testsequence>
-</xenrt>