From c33b2b200ae49906eb1fd4bd28859bf93d28a455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Oct 2024 12:03:35 +0200 Subject: [PATCH] vms/run: don't use deprecated clanCore option --- pkgs/clan-cli/clan_cli/vms/run.py | 11 ++++++----- pkgs/clan-cli/tests/test_vms_cli.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index 30c5fe254..dd44135f2 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/pkgs/clan-cli/clan_cli/vms/run.py @@ -31,13 +31,14 @@ log = logging.getLogger(__name__) def facts_to_nixos_config(facts: dict[str, dict[str, bytes]]) -> dict: nixos_config: dict = {} - nixos_config["clanCore"] = {} - nixos_config["clanCore"]["secrets"] = {} + nixos_config["clan"] = {} + nixos_config["clan"]["core"] = {} + nixos_config["clan"]["core"]["secrets"] = {} for service, service_facts in facts.items(): - nixos_config["clanCore"]["secrets"][service] = {} - nixos_config["clanCore"]["secrets"][service]["facts"] = {} + nixos_config["clan"]["core"]["secrets"][service] = {} + nixos_config["clan"]["core"]["secrets"][service]["facts"] = {} for fact, value in service_facts.items(): - nixos_config["clanCore"]["secrets"][service]["facts"][fact] = { + nixos_config["clan"]["core"]["secrets"][service]["facts"][fact] = { "value": value.decode() } return nixos_config diff --git a/pkgs/clan-cli/tests/test_vms_cli.py b/pkgs/clan-cli/tests/test_vms_cli.py index 57d9faf7a..115b7bef6 100644 --- a/pkgs/clan-cli/tests/test_vms_cli.py +++ b/pkgs/clan-cli/tests/test_vms_cli.py @@ -68,7 +68,7 @@ def test_vm_persistence( config["my_machine"]["systemd"]["services"]["logrotate-checkconf"]["enable"] = False config["my_machine"]["services"]["getty"]["autologinUser"] = "root" config["my_machine"]["clan"]["virtualisation"] = {"graphics": False} - config["my_machine"]["clan"]["networking"] = {"targetHost": "client"} + config["my_machine"]["clan"]["core"]["networking"] = {"targetHost": "client"} config["my_machine"]["clan"]["core"]["state"]["my_state"]["folders"] = [ # to be owned by root "/var/my-state",