From 2e7291970aacfb79e0e466037459435a05a88015 Mon Sep 17 00:00:00 2001
From: John Dilley <john.dilley@citrix.com>
Date: Mon, 9 Nov 2015 11:33:03 +0000
Subject: [PATCH] Reduce machine usage for FC tests

---
 exec/testcases/xenserver/install.py                   | 2 --
 seqs/bostonOnlineLeafCoalesceLVMoHBA.seq              | 2 --
 seqs/bostonstorageLeafCoalesceLVMoHBA.seq             | 2 --
 seqs/clearwater-sxm-hbasr-config-05.seq               | 2 --
 seqs/clearwaterOnlineLeafCoalesceLVMoHBA.seq          | 2 --
 seqs/clearwaterstorageLeafCoalesceLVMoHBA.seq         | 2 --
 seqs/clearwaterstoragestorageLeafCoalesceLVMoHBA.seq  | 2 --
 seqs/creedence-sxm-hbasr-config-05.seq                | 2 --
 seqs/creedenceOnlineLeafCoalesceLVMoHBA.seq           | 2 --
 seqs/creedencestorageLeafCoalesceLVMoHBA.seq          | 2 --
 seqs/creedencestoragestorageLeafCoalesceLVMoHBA.seq   | 2 --
 seqs/dundee-sxm-hbasr-config-05-thin.seq              | 2 --
 seqs/dundee-sxm-hbasr-config-05.seq                   | 2 --
 seqs/dundeeOnlineLeafCoalesceLVMoHBA.seq              | 2 --
 seqs/dundeestorageLeafCoalesceLVMoHBA.seq             | 2 --
 seqs/dundeestoragestorageLeafCoalesceLVMoHBA-thin.seq | 2 --
 seqs/dundeestoragestorageLeafCoalesceLVMoHBA.seq      | 2 --
 seqs/tampa-sxm-hbasr-config-05.seq                    | 2 --
 seqs/tampaOnlineLeafCoalesceLVMoHBA.seq               | 2 --
 seqs/tampastorageLeafCoalesceLVMoHBA.seq              | 2 --
 seqs/tampastoragestorageLeafCoalesceLVMoHBA.seq       | 2 --
 21 files changed, 42 deletions(-)

diff --git a/exec/testcases/xenserver/install.py b/exec/testcases/xenserver/install.py
index 69fff10c0..d5f9ca7d6 100755
--- 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 0037c4f9b..44e40bf6c 100755
--- 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 1ab1ee3c1..c055ece02 100755
--- 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 fccc3e246..2d1859c4a 100755
--- 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 7a4bf5dca..ba99f4fa7 100755
--- 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 d19dc95ad..27f0df859 100755
--- 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 d19dc95ad..27f0df859 100755
--- 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 97471b809..eb29c5ab4 100644
--- 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 f1a909a3d..40da862aa 100644
--- 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 f57d91596..c6c91fa32 100644
--- 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 f57d91596..c6c91fa32 100644
--- 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 d336baec9..5f2831c9b 100644
--- 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 9f0fa6d4a..221c02341 100644
--- 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 09d33f8d7..b0ab581d7 100644
--- 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 66a746f58..e3dbc9241 100644
--- 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 c904de0c2..22015dda4 100644
--- 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 66a746f58..e3dbc9241 100644
--- 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 ef5ceca76..c7f0ba056 100755
--- 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 eaf88d1ed..bf5384597 100755
--- 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 6388c4a50..efb82f78e 100755
--- 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 6388c4a50..efb82f78e 100755
--- 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">
-- 
2.39.5