Search for helper scripts in /usr/lib/xcp/bin as well as /opt/xensour…

…ce/bin

XSConsoleConfig.py

@@ -41,6 +41,11 @@ def __init__(self):
         for path in ["/usr/bin/xe", "/opt/xensource/bin/xe"]:
             if os.path.exists(path):
                 self.xecli = path
+
+        self.helperdir = ''
+        for path in ["/usr/lib/xcp/bin", "/opt/xensource/bin"]:
+            if os.path.exists(path):
+                self.helperdir = path
                 break
 
     @classmethod
@@ -84,6 +89,9 @@ def XCPConfigDir(self):
     def XECLIPath(self):
         return self.xecli
 
+    def HelperPath(self):
+        return self.helperdir
+
 # Import a more specific configuration if available
 if os.path.isfile(sys.path[0]+'/XSConsoleConfigOEM.py'):
     import XSConsoleConfigOEM

plugins-base/XSFeatureDRBackup.py

@@ -34,7 +34,7 @@ def DoAction(self, inSR):
         try:
             # determine if there is a backup VDI or not, and if not just create one
             sr_uuid = inSR['uuid']
-            command = "/opt/xensource/bin/xe-backup-metadata -n -u " + sr_uuid
+            command = "%s/xe-backup-metadata -n -u %s" % (Config.Inst().HelperPath(), sr_uuid)
 
             status, output = commands.getstatusoutput(command)
             status = os.WEXITSTATUS(status)
@@ -45,7 +45,7 @@ def DoAction(self, inSR):
                raise Exception(output)
 
             Layout.Inst().TransientBanner(Lang("Backing up metadata... This may take several minutes."))
-            command = "/opt/xensource/bin/xe-backup-metadata " + initalize_vdi + " -u " + sr_uuid
+            command = "%s/xe-backup-metadata %s -u %s" % (Config.Inst().HelperPath(), initalize_vdi, sr_uuid)
             status, output = commands.getstatusoutput(command)
             if status == 0:
                 Layout.Inst().PushDialogue(InfoDialogue(Lang("Backup Successful"), output))

plugins-base/XSFeatureDRRestore.py

@@ -91,7 +91,7 @@ def HandleMethodChoice(self, inChoice, dryRun):
             else:
               dry_flag=""
             Layout.Inst().TransientBanner(Lang("Restoring VM Metadata.  This may take a few minutes..."))
-            command = "/opt/xensource/bin/xe-restore-metadata -y " + dry_flag +" -u " + self.sr_uuid + " -x " + self.vdi_uuid + " -d " + self.chosen_date + " -m " + chosen_mode
+            command = "%s/xe-restore-metadata -y %s -u %s -x %s -d %s -m %s" % (Config.Inst().HelperPath(), dry_flag, self.sr_uuid, self.vdi_uuid, self.chosen_date, chosen_mode)
             status, output = commands.getstatusoutput(command)
             status = os.WEXITSTATUS(status)
             Layout.Inst().PopDialogue()
@@ -143,7 +143,7 @@ def DoAction(self, inSR):
         sr_uuid = inSR['uuid']
         try:
             # probe for the restore VDI UUID
-            command = "/opt/xensource/bin/xe-restore-metadata -p -u " + sr_uuid
+            command = "%s/xe-restore-metadata -p -u %s" % (Config.Inst().HelperPath(), sr_uuid)
             cmd = subprocess.Popen(command, 
                                    stdout = subprocess.PIPE,
                                    stderr = subprocess.PIPE,
@@ -159,7 +159,7 @@ def DoAction(self, inSR):
 
             # list the available backups
             Layout.Inst().TransientBanner(Lang("Found VDI, retrieving available backups..."))
-            command = "/opt/xensource/bin/xe-restore-metadata -l -u " + sr_uuid + " -x " + vdi_uuid
+            command = "%s/xe-restore-metadata -l -u %s -x %s" % (Config.Inst().HelperPath(), sr_uuid, vdi_uuid)
             cmd = subprocess.Popen(command, 
                                    stdout = subprocess.PIPE,
                                    stderr = subprocess.PIPE,