Use OVERRIDE_BOOT_TYPE

diff --git a/exec/xenrt/lib/xenserver/host.py b/exec/xenrt/lib/xenserver/host.py
index f38044a2035376acb2a19ab3f118be2b78abe61d..8cb82a5255d1aedbe7e746df42c04044e5e81a3f 100755 (executable)
--- a/exec/xenrt/lib/xenserver/host.py
+++ b/exec/xenrt/lib/xenserver/host.py
@@ -670,7 +670,7 @@ class Host(xenrt.GenericHost):
 
     @property
     def mpathRoot(self):
-        return self.lookup("OPTION_ROOT_MPATH", False, boolean=True) and not self.lookup("FORCE_NO_ROOT_MPATH", False, boolean=True) and not self.lookup("NO_SAN_ROOT", False, boolean=True)
+        return self.lookup("OPTION_ROOT_MPATH", False, boolean=True) and not self.lookup("FORCE_NO_ROOT_MPATH", False, boolean=True) and self.lookup("OVERRIDE_BOOT_TYPE", None) != "NOSAN"
 
     @property
     def xapiObject(self):

diff --git a/exec/xenrt/objects.py b/exec/xenrt/objects.py
index ed27224f028303d1c671e22f8e1d2ab3a5408714..79cc06b7d8beda76d0d61d37eb66dcc29ede2db8 100755 (executable)
--- a/exec/xenrt/objects.py
+++ b/exec/xenrt/objects.py
@@ -6829,20 +6829,21 @@ chain tftp://${next-server}/%s
 
         return subnetMask,gateway
 
-    def getChainBoot(self, noSan=False):
-        noSan = noSan or self.lookup("NO_SAN_ROOT", False, boolean=True)
-        ret = None
-        if noSan:
-            ret = self.lookup("PXE_CHAIN_LOCAL_BOOT_NOSAN", None)
+    def getChainBoot(self, overrideBoot=None):
+        if not overrideBoot:
+            overrideBoot = self.lookup("OVERRIDE_BOOT_TYPE", None)
+        if overrideBoot:
+            ret = self.lookup("PXE_CHAIN_LOCAL_BOOT_%s" % overrideBoot, None)
         if not ret:
             ret = self.lookup("PXE_CHAIN_LOCAL_BOOT", None)
         return ret
 
-    def _getDisks(self, var, sdfallback, count, ccissIfAvailable, legacySATA, noSan):
-        noSan = noSan or self.lookup("NO_SAN_ROOT", False, boolean=True)
+    def _getDisks(self, var, sdfallback, count, ccissIfAvailable, legacySATA, overrideBoot):
+        if not overrideBoot:
+            overrideBoot = self.lookup("OVERRIDE_BOOT_TYPE", None)
         disks = None
-        if noSan:
-            varlist = ["%s_NOSAN" % var, var]
+        if overrideBoot:
+            varlist = ["%s_%s" % (var, overrideBoot), var]
         else:
             varlist = [var]
         for v in varlist:
@@ -6874,14 +6875,14 @@ chain tftp://${next-server}/%s
         else:
             return string.split(disks)[:count]
 
-    def _getMainDisks(self, count, ccissIfAvailable, legacySATA, noSan):
-        return self._getDisks("OPTION_CARBON_DISKS", True, count=count, ccissIfAvailable=ccissIfAvailable, legacySATA=legacySATA, noSan=noSan)
+    def _getMainDisks(self, count, ccissIfAvailable, legacySATA, overrideBoot):
+        return self._getDisks("OPTION_CARBON_DISKS", True, count=count, ccissIfAvailable=ccissIfAvailable, legacySATA=legacySATA, overrideBoot=overrideBoot)
 
-    def getInstallDisk(self, ccissIfAvailable=False, legacySATA=False, noSan=False):
-        return self._getMainDisks(ccissIfAvailable=ccissIfAvailable, count=1, legacySATA=legacySATA, noSan=noSan)[0]
+    def getInstallDisk(self, ccissIfAvailable=False, legacySATA=False, overrideBoot=None):
+        return self._getMainDisks(ccissIfAvailable=ccissIfAvailable, count=1, legacySATA=legacySATA, overrideBoot=overrideBoot)[0]
 
-    def getGuestDisks(self, count=1, ccissIfAvailable=False, legacySATA=False, noSan=False):
-        disks = self._getDisks("OPTION_GUEST_DISKS", False, count=count, ccissIfAvailable=ccissIfAvailable, legacySATA=legacySATA, noSan=noSan)
+    def getGuestDisks(self, count=1, ccissIfAvailable=False, legacySATA=False, overrideBoot=None):
+        disks = self._getDisks("OPTION_GUEST_DISKS", False, count=count, ccissIfAvailable=ccissIfAvailable, legacySATA=legacySATA, overrideBoot=overrideBoot)
         if disks:
             return disks
         else: