Reduce machine usage for FC tests

diff --git a/exec/testcases/xenserver/install.py b/exec/testcases/xenserver/install.py
index 69fff10c0b25fbe3c372d3d5d419ba557ab65287..d5f9ca7d63dd5debe2b50477512377f60512ef5b 100755 (executable)
--- a/exec/testcases/xenserver/install.py
+++ b/exec/testcases/xenserver/install.py
@@ -342,8 +342,6 @@ class TCXenServerInstall(xenrt.TestCase):
             if not fcsr:
                 fcsr = host.lookup("SR_FC", None)
             if fcsr:
-                if fcsr == "yes":
-                    fcsr = "LUN0"
                 lun = xenrt.HBALun([host])
                 multipathing = host.lookup("USE_MULTIPATH",
                                            False,

diff --git a/seqs/bostonOnlineLeafCoalesceLVMoHBA.seq b/seqs/bostonOnlineLeafCoalesceLVMoHBA.seq
index 0037c4f9becd10e99c9d6521ca31515e1ff5da69..44e40bf6ce135f7497d18eb890dc82f1e3105541 100755 (executable)
--- a/seqs/bostonOnlineLeafCoalesceLVMoHBA.seq
+++ b/seqs/bostonOnlineLeafCoalesceLVMoHBA.seq
@@ -14,8 +14,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/bostonstorageLeafCoalesceLVMoHBA.seq b/seqs/bostonstorageLeafCoalesceLVMoHBA.seq
index 1ab1ee3c179590d77a8ccbae96bfbce90c8eec50..c055ece02c5c70edde102edd5b701dade336fc60 100755 (executable)
--- a/seqs/bostonstorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/bostonstorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/clearwater-sxm-hbasr-config-05.seq b/seqs/clearwater-sxm-hbasr-config-05.seq
index fccc3e246df7f9f13e5207eb6bce90e3baf684e5..2d1859c4a912711d242a9bfb756a70093096df3b 100755 (executable)
--- a/seqs/clearwater-sxm-hbasr-config-05.seq
+++ b/seqs/clearwater-sxm-hbasr-config-05.seq
@@ -18,8 +18,6 @@
     <pool id="1">
       <storage type="fc" name="lvmohba_targetSR" options="LUN2"/>
       <host id="2" />
-      <!-- We need to use 4 hosts in this test to stop another job trampling on the SR -->
-      <host id="3" />
     </pool>
   </prepare>
 

diff --git a/seqs/clearwaterOnlineLeafCoalesceLVMoHBA.seq b/seqs/clearwaterOnlineLeafCoalesceLVMoHBA.seq
index 7a4bf5dcab52f764bfcfcd60da4bd504192ba752..ba99f4fa79e03396e2f94acb11551720bf1c2b69 100755 (executable)
--- a/seqs/clearwaterOnlineLeafCoalesceLVMoHBA.seq
+++ b/seqs/clearwaterOnlineLeafCoalesceLVMoHBA.seq
@@ -14,8 +14,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/clearwaterstorageLeafCoalesceLVMoHBA.seq b/seqs/clearwaterstorageLeafCoalesceLVMoHBA.seq
index d19dc95ad803426b1e2f9083987e265ddde657ba..27f0df859e4d52764fb5ea9baf9e6258e8ea828e 100755 (executable)
--- a/seqs/clearwaterstorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/clearwaterstorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/clearwaterstoragestorageLeafCoalesceLVMoHBA.seq b/seqs/clearwaterstoragestorageLeafCoalesceLVMoHBA.seq
index d19dc95ad803426b1e2f9083987e265ddde657ba..27f0df859e4d52764fb5ea9baf9e6258e8ea828e 100755 (executable)
--- a/seqs/clearwaterstoragestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/clearwaterstoragestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/creedence-sxm-hbasr-config-05.seq b/seqs/creedence-sxm-hbasr-config-05.seq
index 97471b809eb8d5860a36988b48a314b87221cb99..eb29c5ab40b0e030758c18c02b3a5499c12287c6 100644 (file)
--- a/seqs/creedence-sxm-hbasr-config-05.seq
+++ b/seqs/creedence-sxm-hbasr-config-05.seq
@@ -18,8 +18,6 @@
     <pool id="1">
       <storage type="fc" name="lvmohba_targetSR" options="LUN2"/>
       <host id="2" />
-      <!-- We need to use 4 hosts in this test to stop another job trampling on the SR -->
-      <host id="3" />
     </pool>
   </prepare>
 

diff --git a/seqs/creedenceOnlineLeafCoalesceLVMoHBA.seq b/seqs/creedenceOnlineLeafCoalesceLVMoHBA.seq
index f1a909a3dcc53c64f392f23b738f1f82448c0be1..40da862aae5bf5195eb31aa9fbaecb46f2f0f8a8 100644 (file)
--- a/seqs/creedenceOnlineLeafCoalesceLVMoHBA.seq
+++ b/seqs/creedenceOnlineLeafCoalesceLVMoHBA.seq
@@ -14,8 +14,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/creedencestorageLeafCoalesceLVMoHBA.seq b/seqs/creedencestorageLeafCoalesceLVMoHBA.seq
index f57d91596ffa936be6e64d8885587b015991ec7d..c6c91fa3223a937a6a74648cf5bdf9fafe719817 100644 (file)
--- a/seqs/creedencestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/creedencestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/creedencestoragestorageLeafCoalesceLVMoHBA.seq b/seqs/creedencestoragestorageLeafCoalesceLVMoHBA.seq
index f57d91596ffa936be6e64d8885587b015991ec7d..c6c91fa3223a937a6a74648cf5bdf9fafe719817 100644 (file)
--- a/seqs/creedencestoragestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/creedencestoragestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/dundee-sxm-hbasr-config-05-thin.seq b/seqs/dundee-sxm-hbasr-config-05-thin.seq
index d336baec9b9504766a0818d6a6ce493f3fdd8526..5f2831c9b7d81c7d196110ec7e23c8a3b73469ca 100644 (file)
--- a/seqs/dundee-sxm-hbasr-config-05-thin.seq
+++ b/seqs/dundee-sxm-hbasr-config-05-thin.seq
@@ -20,8 +20,6 @@
     <pool id="1">
       <storage type="fc" name="lvmohba_targetSR" options="LUN2,thin"/>
       <host id="2" />
-      <!-- We need to use 4 hosts in this test to stop another job trampling on the SR -->
-      <host id="3" />
     </pool>
   </prepare>
 

diff --git a/seqs/dundee-sxm-hbasr-config-05.seq b/seqs/dundee-sxm-hbasr-config-05.seq
index 9f0fa6d4a642b9f6f642eaad11fcae4f0046f2ce..221c023419d408428a7711fb30290910cda9a8e3 100644 (file)
--- a/seqs/dundee-sxm-hbasr-config-05.seq
+++ b/seqs/dundee-sxm-hbasr-config-05.seq
@@ -18,8 +18,6 @@
     <pool id="1">
       <storage type="fc" name="lvmohba_targetSR" options="LUN2"/>
       <host id="2" />
-      <!-- We need to use 4 hosts in this test to stop another job trampling on the SR -->
-      <host id="3" />
     </pool>
   </prepare>
 

diff --git a/seqs/dundeeOnlineLeafCoalesceLVMoHBA.seq b/seqs/dundeeOnlineLeafCoalesceLVMoHBA.seq
index 09d33f8d7e29c064c0ff0419539d1df849ffb583..b0ab581d7eea8b30b215d0058700696b8df64a33 100644 (file)
--- a/seqs/dundeeOnlineLeafCoalesceLVMoHBA.seq
+++ b/seqs/dundeeOnlineLeafCoalesceLVMoHBA.seq
@@ -14,8 +14,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/dundeestorageLeafCoalesceLVMoHBA.seq b/seqs/dundeestorageLeafCoalesceLVMoHBA.seq
index 66a746f58c658d9a5a4b279d4e006fef716cfc12..e3dbc9241b22c7228d891553a7eda4679acd5d07 100644 (file)
--- a/seqs/dundeestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/dundeestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/dundeestoragestorageLeafCoalesceLVMoHBA-thin.seq b/seqs/dundeestoragestorageLeafCoalesceLVMoHBA-thin.seq
index c904de0c2f7f0e51a50354e75a0cd7552d06bced..22015dda40d49c6265c87b1860fc89438b8b0126 100644 (file)
--- a/seqs/dundeestoragestorageLeafCoalesceLVMoHBA-thin.seq
+++ b/seqs/dundeestoragestorageLeafCoalesceLVMoHBA-thin.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true" options="thin"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/dundeestoragestorageLeafCoalesceLVMoHBA.seq b/seqs/dundeestoragestorageLeafCoalesceLVMoHBA.seq
index 66a746f58c658d9a5a4b279d4e006fef716cfc12..e3dbc9241b22c7228d891553a7eda4679acd5d07 100644 (file)
--- a/seqs/dundeestoragestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/dundeestoragestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/tampa-sxm-hbasr-config-05.seq b/seqs/tampa-sxm-hbasr-config-05.seq
index ef5ceca76eaf0adb09296d06f71113a8444c21e1..c7f0ba056aeb726af02b1c8b3e06b1157c5c0330 100755 (executable)
--- a/seqs/tampa-sxm-hbasr-config-05.seq
+++ b/seqs/tampa-sxm-hbasr-config-05.seq
@@ -18,8 +18,6 @@
     <pool id="1">
       <storage type="fc" name="lvmohba_targetSR" options="LUN2"/>
       <host id="2" license="platinum"/>
-      <!-- We need to use 4 hosts in this test to stop another job trampling on the SR -->
-      <host id="3" license="platinum"/>
     </pool>
   </prepare>
 

diff --git a/seqs/tampaOnlineLeafCoalesceLVMoHBA.seq b/seqs/tampaOnlineLeafCoalesceLVMoHBA.seq
index eaf88d1ed7702cbff17b8fe81ab13b171f1d1c05..bf538459710deb104d03de6ecac6bad8cb56c81d 100755 (executable)
--- a/seqs/tampaOnlineLeafCoalesceLVMoHBA.seq
+++ b/seqs/tampaOnlineLeafCoalesceLVMoHBA.seq
@@ -14,8 +14,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/tampastorageLeafCoalesceLVMoHBA.seq b/seqs/tampastorageLeafCoalesceLVMoHBA.seq
index 6388c4a508ba95a62f88d95aa95d4ad4a92780e9..efb82f78e4d240f2595a307c0d379c1512754f2c 100755 (executable)
--- a/seqs/tampastorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/tampastorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">

diff --git a/seqs/tampastoragestorageLeafCoalesceLVMoHBA.seq b/seqs/tampastoragestorageLeafCoalesceLVMoHBA.seq
index 6388c4a508ba95a62f88d95aa95d4ad4a92780e9..efb82f78e4d240f2595a307c0d379c1512754f2c 100755 (executable)
--- a/seqs/tampastoragestorageLeafCoalesceLVMoHBA.seq
+++ b/seqs/tampastoragestorageLeafCoalesceLVMoHBA.seq
@@ -15,8 +15,6 @@
       <host id="1"/>
       <storage type="fc" name="fcsr" default="true"/>
     </pool>
-    <host id="2"/>
-    <host id="3"/>
   </prepare>
 
   <testsequence group="LVM">