Updated thinlvhd torture tests

1. Fixed bug in sequence.
2. Added new thick LVHD seq for comparison.

diff --git a/exec/testcases/xenserver/tc/thinlvhdstress.py b/exec/testcases/xenserver/tc/thinlvhdstress.py
index a1073cc0f91507990eaabfa2369e039e7c91994a..a04dcb41493f9fadff5bb8c0931e0ce77da8a75e 100644 (file)
--- a/exec/testcases/xenserver/tc/thinlvhdstress.py
+++ b/exec/testcases/xenserver/tc/thinlvhdstress.py
@@ -22,13 +22,14 @@ class TCParallelWriting(xenrt.TestCase):
         # TODO: following codes are not required after CP-14242
         if not xenrt.TEC().lookup("NO_XENVMD", False, boolean=True):
             srobj = xenrt.lib.xenserver.getStorageRepositoryClass(self.host, sr).fromExistingSR(self.host, sr)
-            if self.host.pool:
-                for host in self.host.pool.getHosts():
-                    output = host.execRawStorageCommand(srobj, "lvs /dev/VG_XenStorage-%s --nosuffix | grep %s-free" % (sr, host.uuid))
+            if srobj.thinProvisioning:
+                if self.host.pool:
+                    for host in self.host.pool.getHosts():
+                        output = host.execRawStorageCommand(srobj, "lvs /dev/VG_XenStorage-%s --nosuffix | grep %s-free" % (sr, host.uuid))
+                        stat -= int(output.split()[-1])
+                else:
+                    output = self.host.execRawStorageCommand(srobj, "lvs /dev/VG_XenStorage-%s --nosuffix | grep %s-free" % (sr, self.host.uuid))
                     stat -= int(output.split()[-1])
-            else:
-                output = self.host.execRawStorageCommand(srobj, "lvs /dev/VG_XenStorage-%s --nosuffix | grep %s-free" % (sr, self.host.uuid))
-                stat -= int(output.split()[-1])
 
         return stat
 

diff --git a/seqs/dundeethinlvhdtorture.seq b/seqs/dundeethinlvhdtorture.seq
index 8a739d54a0ccf493ce7d62d8a3940ae8a690f80f..e77b95abc7d2f2fa88a730c49833553b631bd534 100644 (file)
--- a/seqs/dundeethinlvhdtorture.seq
+++ b/seqs/dundeethinlvhdtorture.seq
@@ -17,8 +17,8 @@
 
   <scheduler>
     <pool>VMX</pool>
-    <param>FLAGS_3=sdb=ssdintel</param>
-    <param>MACHINES_REQUIRED=4</param>
+    <param>FLAGS_4=sdb=ssdintel</param>
+    <param>MACHINES_REQUIRED=5</param>
   </scheduler>
 
   <prepare>
@@ -27,8 +27,9 @@
       <host id="1" />
       <host id="2" />
       <host id="3" />
-      <storage type="lvmoiscsi" name="iscsisr" size="600" vmhost="3" options="ietvm,thin" default="true"/>
+      <storage type="lvmoiscsi" name="iscsisr" size="600" vmhost="4" options="ietvm,thin" default="true"/>
     </pool>
+    <host id="4" />
   </prepare>
 
   <testsequence>

diff --git a/seqs/dundeethinlvhdtorturethick.seq b/seqs/dundeethinlvhdtorturethick.seq
new file mode 100644 (file)
index 0000000..e465189
--- /dev/null
+++ b/seqs/dundeethinlvhdtorturethick.seq
@@ -0,0 +1,52 @@
+<xenrt>
+  <default name="GUESTVCPUS" value="2" />
+  <default name="GUESTDISTRO" value="generic-linux" />
+  <default name="GUESTARCH" value="x86-64" />
+  <default name="GUESTMEMORY" value="1024" />
+  <default name="VDICOUNT" value="200" />
+  <default name="VDISIZE" value="3" /> <!-- in GiB -->
+  <default name="ITERATION" value="1" />
+
+  <variables>
+    <PRODUCT_VERSION>Dundee</PRODUCT_VERSION>
+    <INSTALL_SR_TYPE>lvm</INSTALL_SR_TYPE>
+    <OPTION_KEEP_ISCSI>yes</OPTION_KEEP_ISCSI>
+    <LINUX_ISCSI_TARGET>LIO</LINUX_ISCSI_TARGET>
+    <PREPARE_WORKERS>5</PREPARE_WORKERS>
+  </variables>
+
+  <scheduler>
+    <pool>VMX</pool>
+    <param>FLAGS_4=sdb=ssdintel</param>
+    <param>MACHINES_REQUIRED=5</param>
+  </scheduler>
+
+  <prepare>
+    <pool>
+      <host id="0" />
+      <host id="1" />
+      <host id="2" />
+      <host id="3" />
+      <storage type="lvmoiscsi" name="iscsisr" size="600" vmhost="4" options="ietvm" default="true"/>
+    </pool>
+    <host id="4" />
+  </prepare>
+
+  <testsequence>
+    <!-- more aggresive test required. so using pattern.py
+    <testcase id="testcases.xenserver.tc.thinlvhdstress.TCParallelWriting" tc="TC-27240" name="InGuestSeqWriting">
+      <arg>vms=yes</arg>
+      <arg>iteration=${ITERATION}</arg>
+      <arg>vdicount=${VDICOUNT}</arg>
+      <arg>vdisize=${VDISIZE}</arg>
+    </testcase>
+    -->
+    <testcase id="testcases.xenserver.tc.thinlvhdstress.TCParallelWriting" tc="TC-27241" name="InGuestPtnWriting">
+      <arg>vms=yes</arg>
+      <arg>iteration=${ITERATION}</arg>
+      <arg>vdicount=${VDICOUNT}</arg>
+      <arg>vdisize=${VDISIZE}</arg>
+      <arg>sequential=no</arg>
+    </testcase>
+  </testsequence>
+</xenrt>