Add nested mark for update tools

Signed-off-by: Olivier Hoareau <olivier.hoareau@vates.tech>

Author: olivierh-pro

README.md

@@ -584,6 +584,8 @@ For each pool target :
 2. Get attached secondary hosts of the pool
   * Repeat step `1.` for each secondary
 
+It is possible to mark target as *"nested"* (XCP-ng inside VM). *See inventory example below*
+
 **Inventory file**
 
 `update` command can read an inventory file in [TOML v1.0.0](https://toml.io/en/v1.0.0) format:
@@ -604,6 +606,7 @@ Take a look at an example inventory file:
 parent = "ip_or_hostname" # master host
 
 [all]
+nested = true
 enablerepos = ["xcp-ng-base"]
 
 [servers]

lib/tools/cli.py

@@ -17,7 +17,7 @@ def _command_update(args: argparse.Namespace) -> None:
     if args.inventory:
         inventory = load_inventory(args.inventory)
     else:
-        inventory = into_inventory(args.hosts, args.repos, args.parent_host)
+        inventory = into_inventory(args.hosts, args.repos, args.parent_host, args.nested)
 
     update_pools(inventory)
 
@@ -59,6 +59,9 @@ def cli() -> None:
         type=HostAddress,
         help="Address (hostname|ip) of the parent master host (works with '--nested')",
     )
+    subparser_cmd_update.add_argument(
+        "--nested", action="store_true", default=False, help="Indicate whether hosts are nested or not"
+    )
     subparser_cmd_update.set_defaults(func=_command_update)
 
     args = parser.parse_args()

lib/tools/inventory.py

@@ -7,9 +7,9 @@
 
 from lib.common import HostAddress
 
-def load_inventory(inventory_path: Path) -> dict[str, dict[str, list[str]]]:
+def load_inventory(inventory_path: Path) -> dict[str, dict[str, list[str] | bool]]:
     """Create an inventory object from loaded inventory file."""
-    inventory: dict[str, dict[str, list[str]]] = {}
+    inventory: dict[str, dict[str, list[str] | bool]] = {}
 
     with open(inventory_path, "rb") as f:
         data = tomllib.load(f)
@@ -19,8 +19,13 @@ def load_inventory(inventory_path: Path) -> dict[str, dict[str, list[str]]]:
 
     inventory_hosts = {}
     for server, config in servers.items():
+        nested = config.get("nested", None)
+        # We can't use 'False' as fallback value here, because 'False' is falsy...
+        if nested is None:
+            nested = all.get("nested", False)
         repos = config.get("enablerepos", [])
         host = {
+            "nested": nested,
             "enablerepos": repos or all.get("enablerepos", [])
         }
         inventory_hosts[server] = host
@@ -31,17 +36,18 @@ def load_inventory(inventory_path: Path) -> dict[str, dict[str, list[str]]]:
     return inventory
 
 def into_inventory(
-    hosts: list[HostAddress], enablerepos: list[str], parent: HostAddress
-) -> dict[HostAddress, dict[str, list[str]]]:
+    hosts: list[HostAddress], enablerepos: list[str], parent: HostAddress, nested: bool
+) -> dict[HostAddress, dict[str, list[str] | bool]]:
     """Create an inventory object from arguments.
 
     Basically, it is used as compatibility when we don't want inventory from file.
     """
-    inventory: dict[HostAddress, dict[str, list[str]]] = {}
+    inventory: dict[HostAddress, dict[str, list[str] | bool]] = {}
 
     inventory_hosts = {}
     for h in hosts:
-        host: dict[str, list[str]] = {
+        host: dict[str, list[str] | bool] = {
+            "nested": nested or False,
             "enablerepos": enablerepos or [],
         }
         inventory_hosts[h] = host