Added clanName argument to clan-core.lib.builClan

pkgs/clan-cli/clan_cli/task_manager.py

@@ -63,6 +63,7 @@ class Command:
         os.set_blocking(self.p.stdout.fileno(), False)
         os.set_blocking(self.p.stderr.fileno(), False)
 
+
         while self.p.poll() is None:
             # Check if stderr is ready to be read from
             rlist, _, _ = select.select([self.p.stderr, self.p.stdout], [], [], 0)
@@ -70,10 +71,10 @@ class Command:
                 try:
                     for line in fd:
                         if fd == self.p.stderr:
-                            print(f"[{cmd[0]}] stderr: {line.rstrip()}")
+                            self.log.debug(f"[{cmd[0]}] stderr: {line}")
                             self.stderr.append(line)
                         else:
-                            print(f"[{cmd[0]}] stdout: {line.rstrip()}")
+                            self.log.debug(f"[{cmd[0]}] stdout: {line}")
                             self.stdout.append(line)
                         self._output.put(line)
                 except BlockingIOError:

pkgs/clan-cli/clan_cli/vms/create.py

@@ -48,6 +48,7 @@ class BuildVmTask(BaseTask):
         # TODO: We should get this from the vm argument
         vm_config = self.get_vm_create_info(cmds)
 
+        # TODO: Don't use a temporary directory, instead create a new flake directory
         with tempfile.TemporaryDirectory() as tmpdir_:
             tmpdir = Path(tmpdir_)
             xchg_dir = tmpdir / "xchg"

pkgs/clan-cli/tests/test_flake_with_core/flake.nix

@@ -9,6 +9,7 @@
     let
       clan = clan-core.lib.buildClan {
         directory = self;
+        clanName = "test_with_core_clan";
         machines = {
           vm1 = { lib, ... }: {
             clan.networking.deploymentAddress = "__CLAN_DEPLOYMENT_ADDRESS__";

pkgs/clan-cli/tests/test_flake_with_core_and_pass/flake.nix

@@ -9,6 +9,7 @@
     let
       clan = clan-core.lib.buildClan {
         directory = self;
+        clanName = "test_with_core_and_pass_clan";
         machines = {
           vm1 = { lib, ... }: {
             clan.networking.deploymentAddress = "__CLAN_DEPLOYMENT_ADDRESS__";

pkgs/clan-cli/tests/test_flake_with_core_dynamic_machines/flake.nix

@@ -9,6 +9,7 @@
     let
       clan = clan-core.lib.buildClan {
         directory = self;
+        clanName = "core_dynamic_machine_clan";
         machines =
           let
             machineModules = builtins.readDir (self + "/machines");