xo: import xo-cli path from data.TOOLS (and fallback to "xo-cli")

permit to override the xo-cli path locally

Signed-off-by: Sebastien Rodot <sebastien.rodot@vates.tech>

Author: semarie

data.py-dist

@@ -116,6 +116,7 @@ OTHER_GUEST_TOOLS = {
 # Tools
 TOOLS: dict[str, str] = {
 #    "iso-remaster": "/home/user/src/xcpng/xcp/scripts/iso-remaster/iso-remaster.sh",
+#    "xo-cli": "xo-cli",
 }
 
 # Values can be either full URLs or only partial URLs that will be automatically appended to DEF_VM_URL

lib/xo.py

@@ -1,6 +1,7 @@
 import json
 import subprocess
 
+from data import TOOLS
 from lib.typing import JSONType
 
 from typing import Dict, Literal, overload
@@ -28,7 +29,7 @@ def xo_cli(action: str, args: Dict[str, str] = {}, *, check: bool = True, simple
 def xo_cli(
     action: str, args: dict[str, str] = {}, check: bool = True, simple_output: bool = True, use_json: bool = False
 ) -> subprocess.CompletedProcess[bytes] | JSONType | str:
-    run_array = ['xo-cli', action]
+    run_array = [TOOLS.get('xo-cli', 'xo-cli'), action]
     if use_json:
         run_array += ['--json']
     run_array += ["%s=%s" % (key, value) for key, value in args.items()]