From: John Dilley <john.dilley@citrix.com>
Date: Tue, 17 Nov 2015 15:45:36 +0000 (+0000)
Subject: Update non-multipath testcase
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a8edea07f9b8dd5da5ef0cb5ad087649856280af;p=xenrt-citrix%2Fxenrt.git

Update non-multipath testcase
---

diff --git a/exec/testcases/xenserver/tc/install.py b/exec/testcases/xenserver/tc/install.py
index c9a540495..b83b1983b 100755
--- a/exec/testcases/xenserver/tc/install.py
+++ b/exec/testcases/xenserver/tc/install.py
@@ -80,6 +80,9 @@ class TC9352(_HostInstall):
 
     ISCSI_SR_MULTIPATHED = True
 
+    def prepare(self, arglist=None):
+        xenrt.TEC().config.setVariable("FORCE_NO_ROOT_MPATH", "yes") 
+
     def postInstall(self):
         # Create a FC SR on another LUN
         self.fcLun = xenrt.HBALun([self.host])
@@ -367,7 +370,7 @@ class TC12209(TC9352):
     ISCSI_SR_MULTIPATHED = False
     
     def prepare(self, arglist=None):
-        xenrt.TEC().config.setVariable("OPTION_ROOT_MPATH", "") 
+        xenrt.TEC().config.setVariable("FORCE_NO_ROOT_MPATH", "yes") 
 
     def postInstall(self):
         self.scsiid = string.split(self.host.lookup("OPTION_CARBON_DISKS", None), "scsi-")[1]