From 9cdba322b58c833db3829c45d1a03dd9557b977d Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Sun, 23 Jun 2024 12:52:42 +0300
Subject: [PATCH 1/2] feat: Calculate the root file system when creating the
 deployment machine:

- Created a new function called 'calculateRootFs' to calculate the size of the root file system based on the machine specs.
- Created unit tests for the created function to ensure that no weird behavior happens during the calculation.
---
 packages/grid_client/src/helpers/root_fs.ts   | 24 +++++++++++++++++++
 .../grid_client/src/high_level/machine.ts     |  7 ++++++
 .../tests/unittests/root_fs.test.ts           | 15 ++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 packages/grid_client/src/helpers/root_fs.ts
 create mode 100644 packages/grid_client/tests/unittests/root_fs.test.ts

diff --git a/packages/grid_client/src/helpers/root_fs.ts b/packages/grid_client/src/helpers/root_fs.ts
new file mode 100644
index 0000000000..de116c0ef5
--- /dev/null
+++ b/packages/grid_client/src/helpers/root_fs.ts
@@ -0,0 +1,24 @@
+import { Decimal } from "decimal.js";
+
+const GB = 1024;
+
+export interface RootFSOptions {
+  /** The machine CPU, should be in cores e.g. 5 cores*/
+  CPUCores: number;
+  /** The machine memory, should be in megabytes e.g. 1024 or 2048 MG*/
+  RAMInMegaBytes: number;
+}
+
+export default function calculateRootFs(options?: RootFSOptions): number {
+  let cu = 0;
+
+  if (options && options.CPUCores && options.RAMInMegaBytes) {
+    console.log("Here", options);
+    cu = new Decimal(options.CPUCores)
+      .mul(options.RAMInMegaBytes)
+      .divToInt(8 * GB)
+      .toNumber();
+  }
+
+  return cu === 0 ? 500 / GB : 2;
+}
diff --git a/packages/grid_client/src/high_level/machine.ts b/packages/grid_client/src/high_level/machine.ts
index d01821d906..a5745bb4c7 100644
--- a/packages/grid_client/src/high_level/machine.ts
+++ b/packages/grid_client/src/high_level/machine.ts
@@ -2,6 +2,7 @@ import { GridClientErrors, ValidationError } from "@threefold/types";
 import { Addr } from "netaddr";
 
 import { events } from "../helpers/events";
+import calculateRootFs from "../helpers/root_fs";
 import { randomChoice, zeroPadding } from "../helpers/utils";
 import { validateHexSeed } from "../helpers/validator";
 import { DiskModel, MyceliumNetworkModel, QSFSDiskModel } from "../modules/models";
@@ -53,6 +54,12 @@ class VMHL extends HighLevelBase {
     zlogsOutput?: string,
     gpus: string[] = [],
   ): Promise<[TwinDeployment[], string]> {
+    if (!rootfs_size) {
+      rootfs_size = calculateRootFs({
+        CPUCores: cpu,
+        RAMInMegaBytes: memory,
+      });
+    }
     const deployments: TwinDeployment[] = [];
     const workloads: Workload[] = [];
     let totalDisksSize = rootfs_size;
diff --git a/packages/grid_client/tests/unittests/root_fs.test.ts b/packages/grid_client/tests/unittests/root_fs.test.ts
new file mode 100644
index 0000000000..dbd0a63fb9
--- /dev/null
+++ b/packages/grid_client/tests/unittests/root_fs.test.ts
@@ -0,0 +1,15 @@
+import calculateRootFs from "../../src/helpers/root_fs";
+
+describe("Calculate the rootFS size based on the machine specs", () => {
+  it("should return 2GB when the options are provided", () => {
+    const options = { CPUCores: 5, RAMInMegaBytes: 2048 };
+    const result = calculateRootFs(options);
+    expect(result).toEqual(2);
+  });
+
+  it("should return 0.48828125 when CPU cores and RAM are zero", () => {
+    const options = { CPUCores: 0, RAMInMegaBytes: 0 };
+    const result = calculateRootFs(options);
+    expect(result).toEqual(0.48828125);
+  });
+});

From 077aa55cfb68bbb6aae0440256cd8d8778451e7f Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Sun, 23 Jun 2024 17:38:20 +0300
Subject: [PATCH 2/2] chore: Replaced the `rootFS` function with the GC:

- Removed the `rootFS` function/file.
- Updated the solutions with the newly implemented `calculateRootFileSystem`.
- Removed the un-needed debug logs.
- Docstring the newly implemented function.
---
 packages/grid_client/src/helpers/index.ts     |  1 +
 packages/grid_client/src/helpers/root_fs.ts   | 21 +++++++++++++++---
 .../grid_client/src/high_level/machine.ts     |  4 ++--
 .../tests/unittests/root_fs.test.ts           |  6 ++---
 .../src/components/caprover_worker.vue        |  7 ++++--
 .../playground/src/components/k8s_worker.vue  | 11 +++++++---
 .../manage_caprover_worker_dialog.vue         |  8 ++++---
 .../src/components/root_fs_size.vue           |  8 +++----
 packages/playground/src/utils/root_fs.ts      | 16 --------------
 packages/playground/src/weblets/freeflow.vue  |  7 +++---
 .../playground/src/weblets/tf_caprover.vue    | 22 ++++++++++++++-----
 .../playground/src/weblets/tf_casperlabs.vue  |  7 +++---
 .../playground/src/weblets/tf_discourse.vue   |  7 +++---
 .../playground/src/weblets/tf_funkwhale.vue   |  7 +++---
 .../playground/src/weblets/tf_mattermost.vue  |  7 +++---
 .../playground/src/weblets/tf_nextcloud.vue   |  7 +++---
 .../playground/src/weblets/tf_owncloud.vue    |  7 +++---
 .../playground/src/weblets/tf_peertube.vue    |  7 +++---
 .../playground/src/weblets/tf_presearch.vue   |  5 ++---
 .../src/weblets/tf_staticwebsite.vue          |  7 +++---
 .../playground/src/weblets/tf_subsquid.vue    |  7 +++---
 packages/playground/src/weblets/tf_taiga.vue  |  7 +++---
 packages/playground/src/weblets/tf_umbrel.vue |  7 +++---
 .../playground/src/weblets/tf_wordpress.vue   |  7 +++---
 24 files changed, 117 insertions(+), 83 deletions(-)
 delete mode 100644 packages/playground/src/utils/root_fs.ts

diff --git a/packages/grid_client/src/helpers/index.ts b/packages/grid_client/src/helpers/index.ts
index ef382c8e77..df0e217c10 100644
--- a/packages/grid_client/src/helpers/index.ts
+++ b/packages/grid_client/src/helpers/index.ts
@@ -4,3 +4,4 @@ export * from "./events";
 export * from "./validator";
 export * from "./expose";
 export * from "./migration";
+export * from "./root_fs";
diff --git a/packages/grid_client/src/helpers/root_fs.ts b/packages/grid_client/src/helpers/root_fs.ts
index de116c0ef5..6988b959be 100644
--- a/packages/grid_client/src/helpers/root_fs.ts
+++ b/packages/grid_client/src/helpers/root_fs.ts
@@ -2,18 +2,31 @@ import { Decimal } from "decimal.js";
 
 const GB = 1024;
 
-export interface RootFSOptions {
+interface RootFSOptions {
   /** The machine CPU, should be in cores e.g. 5 cores*/
   CPUCores: number;
   /** The machine memory, should be in megabytes e.g. 1024 or 2048 MG*/
   RAMInMegaBytes: number;
 }
 
-export default function calculateRootFs(options?: RootFSOptions): number {
+/**
+ * Calculate the root filesystem size (CU - Compute Units) based on provided options.
+ *
+ * This function calculates the compute units (CU) required based on the CPU cores and RAM in megabytes.
+ * If both CPU cores and RAM are provided in the `options` parameter, it calculates CU by multiplying
+ * the CPU cores with RAM and dividing by 8 * GB, then converting the result to an integer. If the
+ * calculated CU is zero, it returns 500 / GB; otherwise, it returns 2.
+ *
+ * @param {RootFSOptions} [options] - Optional configuration object.
+ * @param {number} [options.CPUCores] - The number of CPU cores.
+ * @param {number} [options.RAMInMegaBytes] - The RAM size in megabytes.
+ *
+ * @returns {number} - The calculated compute units (CU) based on the provided options.
+ */
+function calculateRootFileSystem(options?: RootFSOptions): number {
   let cu = 0;
 
   if (options && options.CPUCores && options.RAMInMegaBytes) {
-    console.log("Here", options);
     cu = new Decimal(options.CPUCores)
       .mul(options.RAMInMegaBytes)
       .divToInt(8 * GB)
@@ -22,3 +35,5 @@ export default function calculateRootFs(options?: RootFSOptions): number {
 
   return cu === 0 ? 500 / GB : 2;
 }
+
+export { calculateRootFileSystem, RootFSOptions };
diff --git a/packages/grid_client/src/high_level/machine.ts b/packages/grid_client/src/high_level/machine.ts
index a5745bb4c7..0de7b154c1 100644
--- a/packages/grid_client/src/high_level/machine.ts
+++ b/packages/grid_client/src/high_level/machine.ts
@@ -2,7 +2,7 @@ import { GridClientErrors, ValidationError } from "@threefold/types";
 import { Addr } from "netaddr";
 
 import { events } from "../helpers/events";
-import calculateRootFs from "../helpers/root_fs";
+import { calculateRootFileSystem } from "../helpers/root_fs";
 import { randomChoice, zeroPadding } from "../helpers/utils";
 import { validateHexSeed } from "../helpers/validator";
 import { DiskModel, MyceliumNetworkModel, QSFSDiskModel } from "../modules/models";
@@ -55,7 +55,7 @@ class VMHL extends HighLevelBase {
     gpus: string[] = [],
   ): Promise<[TwinDeployment[], string]> {
     if (!rootfs_size) {
-      rootfs_size = calculateRootFs({
+      rootfs_size = calculateRootFileSystem({
         CPUCores: cpu,
         RAMInMegaBytes: memory,
       });
diff --git a/packages/grid_client/tests/unittests/root_fs.test.ts b/packages/grid_client/tests/unittests/root_fs.test.ts
index dbd0a63fb9..f4e07a1e79 100644
--- a/packages/grid_client/tests/unittests/root_fs.test.ts
+++ b/packages/grid_client/tests/unittests/root_fs.test.ts
@@ -1,15 +1,15 @@
-import calculateRootFs from "../../src/helpers/root_fs";
+import { calculateRootFileSystem } from "../../src/helpers/root_fs";
 
 describe("Calculate the rootFS size based on the machine specs", () => {
   it("should return 2GB when the options are provided", () => {
     const options = { CPUCores: 5, RAMInMegaBytes: 2048 };
-    const result = calculateRootFs(options);
+    const result = calculateRootFileSystem(options);
     expect(result).toEqual(2);
   });
 
   it("should return 0.48828125 when CPU cores and RAM are zero", () => {
     const options = { CPUCores: 0, RAMInMegaBytes: 0 };
-    const result = calculateRootFs(options);
+    const result = calculateRootFileSystem(options);
     expect(result).toEqual(0.48828125);
   });
 });
diff --git a/packages/playground/src/components/caprover_worker.vue b/packages/playground/src/components/caprover_worker.vue
index 542bc4f715..cbc2a8073c 100644
--- a/packages/playground/src/components/caprover_worker.vue
+++ b/packages/playground/src/components/caprover_worker.vue
@@ -47,13 +47,13 @@
 </template>
 
 <script lang="ts">
+import { calculateRootFileSystem } from "@threefold/grid_client";
 import { computed, type PropType } from "vue";
 
 import { manual } from "@/utils/manual";
 
 import Networks from "../components/networks.vue";
 import type { CaproverWorker } from "../types";
-import rootFs from "../utils/root_fs";
 import { generateName } from "../utils/strings";
 import SelectSolutionFlavor from "./select_solution_flavor.vue";
 
@@ -68,7 +68,10 @@ export default {
   setup(props) {
     const rootFilesystemSize = computed(() => {
       const { cpu = 0, memory = 0 } = props.modelValue.solution || {};
-      return rootFs(cpu, memory);
+      return calculateRootFileSystem({
+        CPUCores: cpu,
+        RAMInMegaBytes: memory,
+      });
     });
 
     return { rootFilesystemSize, manual };
diff --git a/packages/playground/src/components/k8s_worker.vue b/packages/playground/src/components/k8s_worker.vue
index 0397a7673f..6bfdc5c295 100644
--- a/packages/playground/src/components/k8s_worker.vue
+++ b/packages/playground/src/components/k8s_worker.vue
@@ -86,7 +86,12 @@
     <TfSelectionDetails
       :filters-validators="{
         memory: { min: 1024 },
-        rootFilesystemSize: { min: rootFs($props.modelValue.cpu ?? 0, $props.modelValue.memory ?? 0) },
+        rootFilesystemSize: {
+          min: calculateRootFileSystem({
+            CPUCores: $props.modelValue.cpu ?? 0,
+            RAMInMegaBytes: $props.modelValue.memory ?? 0,
+          }),
+        },
       }"
       :filters="{
         ipv4: $props.modelValue.ipv4,
@@ -103,13 +108,13 @@
 </template>
 
 <script lang="ts">
+import { calculateRootFileSystem } from "@threefold/grid_client";
 import type { PropType } from "vue";
 
 import { manual } from "@/utils/manual";
 
 import Networks from "../components/networks.vue";
 import type { K8SWorker } from "../types";
-import rootFs from "../utils/root_fs";
 import { generateName } from "../utils/strings";
 import RootFsSize from "./root_fs_size.vue";
 
@@ -140,7 +145,7 @@ export default {
     },
   },
   setup() {
-    return { rootFs, manual };
+    return { calculateRootFileSystem, manual };
   },
 };
 </script>
diff --git a/packages/playground/src/components/manage_caprover_worker_dialog.vue b/packages/playground/src/components/manage_caprover_worker_dialog.vue
index 80e0581631..3904d7faae 100644
--- a/packages/playground/src/components/manage_caprover_worker_dialog.vue
+++ b/packages/playground/src/components/manage_caprover_worker_dialog.vue
@@ -82,7 +82,6 @@ import { ref } from "vue";
 
 import { useGrid } from "../stores";
 import { addMachine, deleteMachine, loadVM } from "../utils/deploy_vm";
-import rootFs from "../utils/root_fs";
 
 const props = defineProps<{ master: any; data: any[]; projectName: string }>();
 const emits = defineEmits<{ (event: "close"): void; (event: "update:caprover", data: any): void }>();
@@ -139,7 +138,10 @@ async function deploy(layout: any) {
         { key: "SWM_NODE_MODE", value: "worker" },
         { key: "PUBLIC_KEY", value: props.master.env.PUBLIC_KEY },
       ],
-      rootFilesystemSize: rootFs(worker.value.solution!.cpu, worker.value.solution!.memory),
+      rootFilesystemSize: calculateRootFileSystem({
+        CPUCores: worker.value.solution!.cpu,
+        RAMInMegaBytes: worker.value.solution!.memory,
+      }),
     });
 
     const [leader, ...workers] = vm;
@@ -181,7 +183,7 @@ async function onDelete(cb: (workers: any[]) => void) {
 </script>
 
 <script lang="ts">
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 
 import CaproverWorker, { createWorker } from "../components/caprover_worker.vue";
 import ListTable from "../components/list_table.vue";
diff --git a/packages/playground/src/components/root_fs_size.vue b/packages/playground/src/components/root_fs_size.vue
index 6dbb8d69c0..cf7364848b 100644
--- a/packages/playground/src/components/root_fs_size.vue
+++ b/packages/playground/src/components/root_fs_size.vue
@@ -26,17 +26,17 @@
 </template>
 
 <script lang="ts" setup>
+import { calculateRootFileSystem } from "@threefold/grid_client";
 import { ref, watch } from "vue";
 
 import type { Validators } from "../types";
-import rootFs from "../utils/root_fs";
 
 const props = defineProps<{ cpu?: number; memory?: number; modelValue?: number }>();
 const emits = defineEmits<{ (event: "update:model-value", value: number): void }>();
 
 const input = ref();
 
-const value = ref(rootFs(props.cpu ?? 0, props.memory ?? 0));
+const value = ref(calculateRootFileSystem({ CPUCores: props.cpu ?? 0, RAMInMegaBytes: props.memory ?? 0 }));
 watch(value, value => emits("update:model-value", value), { immediate: true });
 
 const edit = ref(false);
@@ -47,14 +47,14 @@ watch(
     await input.value.validate(value.value);
 
     if (!edit) {
-      value.value = rootFs(cpu, memory);
+      value.value = calculateRootFileSystem({ CPUCores: cpu, RAMInMegaBytes: memory });
     }
   },
 );
 
 function dynamicValidateRootFs(validators: Validators) {
   return (value: string) => {
-    const min = rootFs(props.cpu ?? 0, props.memory ?? 0);
+    const min = calculateRootFileSystem({ CPUCores: props.cpu ?? 0, RAMInMegaBytes: props.memory ?? 0 });
     return validators.min(`SSD Storage min value is ${min}GB.`, min)(value);
   };
 }
diff --git a/packages/playground/src/utils/root_fs.ts b/packages/playground/src/utils/root_fs.ts
deleted file mode 100644
index cbdd62e8e9..0000000000
--- a/packages/playground/src/utils/root_fs.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Decimal } from "decimal.js";
-
-const GB = 1024;
-
-export default function rootFs(cpu_in_cores?: number, mem_in_mb?: number): number {
-  let cu = 0;
-
-  if (cpu_in_cores && mem_in_mb) {
-    cu = new Decimal(cpu_in_cores)
-      .mul(mem_in_mb)
-      .divToInt(8 * GB)
-      .toNumber();
-  }
-
-  return cu === 0 ? 500 / GB : 2;
-}
diff --git a/packages/playground/src/weblets/freeflow.vue b/packages/playground/src/weblets/freeflow.vue
index 7a88321bdd..5478b04e75 100644
--- a/packages/playground/src/weblets/freeflow.vue
+++ b/packages/playground/src/weblets/freeflow.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, onMounted, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -103,7 +103,9 @@ const disks = ref<Disk[]>([]);
 const dedicated = ref(false);
 const certified = ref(false);
 const ipv4 = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -214,7 +216,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TFFreeflow",
diff --git a/packages/playground/src/weblets/tf_caprover.vue b/packages/playground/src/weblets/tf_caprover.vue
index 1b78f14b89..5eb138659b 100644
--- a/packages/playground/src/weblets/tf_caprover.vue
+++ b/packages/playground/src/weblets/tf_caprover.vue
@@ -6,8 +6,18 @@
     :disk="
       workers.reduce(
         (disk, worker) =>
-          disk + (worker.solution?.disk ?? 0) + rootFs(worker.solution?.cpu ?? 0, worker.solution?.memory ?? 0),
-        leader.solution?.disk ?? 0 + rootFs(leader.solution?.cpu ?? 0, leader.solution?.memory ?? 0),
+          disk +
+          (worker.solution?.disk ?? 0) +
+          calculateRootFileSystem({
+            CPUCores: worker.solution?.cpu ?? 0,
+            RAMInMegaBytes: worker.solution?.memory ?? 0,
+          }),
+        leader.solution?.disk ??
+          0 +
+            calculateRootFileSystem({
+              CPUCores: leader.solution?.cpu ?? 0,
+              RAMInMegaBytes: leader.solution?.memory ?? 0,
+            }),
       )
     "
     :ipv4="true"
@@ -169,7 +179,10 @@ function normalizeCaproverWorker(worker: CW, envs: Env[]): Machine {
     publicIpv4: true,
     planetary: true,
     mycelium: worker.mycelium || false,
-    rootFilesystemSize: rootFs(worker.solution!.cpu, worker.solution!.memory),
+    rootFilesystemSize: calculateRootFileSystem({
+      CPUCores: worker.solution!.cpu,
+      RAMInMegaBytes: worker.solution!.memory,
+    }),
     disks: [
       {
         name: "data0",
@@ -190,7 +203,7 @@ function updateSSHkeyEnv(selectedKeys: string) {
 </script>
 
 <script lang="ts">
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 
 import { createNetwork } from "@/utils/deploy_helpers";
 
@@ -199,7 +212,6 @@ import ExpandableLayout from "../components/expandable_layout.vue";
 import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue";
 import { deploymentListEnvironments } from "../constants";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfCaprover",
diff --git a/packages/playground/src/weblets/tf_casperlabs.vue b/packages/playground/src/weblets/tf_casperlabs.vue
index bedba6134c..83b882e14c 100644
--- a/packages/playground/src/weblets/tf_casperlabs.vue
+++ b/packages/playground/src/weblets/tf_casperlabs.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -99,7 +99,9 @@ const certified = ref(false);
 const ipv4 = ref(false);
 const mycelium = ref(true);
 const planetary = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -203,7 +205,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TFCasperlabs",
diff --git a/packages/playground/src/weblets/tf_discourse.vue b/packages/playground/src/weblets/tf_discourse.vue
index 444d8899ca..02270c643e 100644
--- a/packages/playground/src/weblets/tf_discourse.vue
+++ b/packages/playground/src/weblets/tf_discourse.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { Buffer } from "buffer";
 import TweetNACL from "tweetnacl";
 import { computed, type Ref, ref, watch } from "vue";
@@ -113,7 +113,6 @@ import { ProjectName } from "../types";
 import { deployVM } from "../utils/deploy_vm";
 import { deployGatewayName, getSubdomain, rollbackDeployment } from "../utils/gateway";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 import { generateName, generatePassword } from "../utils/strings";
 
 const layout = useLayout();
@@ -128,7 +127,9 @@ const planetary = ref(true);
 const smtp = ref(createSMTPServer());
 const dedicated = ref(false);
 const certified = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const flist: Flist = {
   value: "https://hub.grid.tf/tf-official-apps/forum-docker-v3.1.2.flist",
diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
index f27fbd36bf..ff38497969 100644
--- a/packages/playground/src/weblets/tf_funkwhale.vue
+++ b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -123,7 +123,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -144,7 +144,9 @@ const username = ref("admin");
 const email = ref(profileManager.profile?.email || "");
 const password = ref(generatePassword(12));
 const solution = ref() as Ref<SolutionFlavor>;
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const flist: Flist = {
   value: "https://hub.grid.tf/tf-official-apps/funkwhale-dec21.flist",
   entryPoint: "/init.sh",
@@ -264,7 +266,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfFunkwhale",
diff --git a/packages/playground/src/weblets/tf_mattermost.vue b/packages/playground/src/weblets/tf_mattermost.vue
index 0fb205e970..0674ac1ff2 100644
--- a/packages/playground/src/weblets/tf_mattermost.vue
+++ b/packages/playground/src/weblets/tf_mattermost.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref, watch } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -108,7 +108,9 @@ const certified = ref(false);
 const ipv4 = ref(false);
 const planetary = ref(true);
 const smtp = ref(createSMTPServer());
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const mycelium = ref(true);
 const selectedSSHKeys = ref("");
@@ -247,7 +249,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfMattermost",
diff --git a/packages/playground/src/weblets/tf_nextcloud.vue b/packages/playground/src/weblets/tf_nextcloud.vue
index fe1d29f655..4869dae292 100644
--- a/packages/playground/src/weblets/tf_nextcloud.vue
+++ b/packages/playground/src/weblets/tf_nextcloud.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -98,7 +98,9 @@ const certified = ref(false);
 const ipv4 = ref(false);
 const mycelium = ref(true);
 const planetary = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -216,7 +218,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TFNextcloud",
diff --git a/packages/playground/src/weblets/tf_owncloud.vue b/packages/playground/src/weblets/tf_owncloud.vue
index 664094bbda..c18da06d09 100644
--- a/packages/playground/src/weblets/tf_owncloud.vue
+++ b/packages/playground/src/weblets/tf_owncloud.vue
@@ -120,7 +120,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref, watch } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -152,7 +152,9 @@ const certified = ref(false);
 const ipv4 = ref(false);
 const mycelium = ref(true);
 const smtp = ref(createSMTPServer());
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
 const grid = gridStore.client as GridClient;
@@ -291,7 +293,6 @@ import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfOwncloud",
diff --git a/packages/playground/src/weblets/tf_peertube.vue b/packages/playground/src/weblets/tf_peertube.vue
index 755c91abcc..7d49729022 100644
--- a/packages/playground/src/weblets/tf_peertube.vue
+++ b/packages/playground/src/weblets/tf_peertube.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -123,7 +123,9 @@ const flist: Flist = {
 const dedicated = ref(false);
 const certified = ref(false);
 const ipv4 = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const mycelium = ref(true);
 const planetary = ref(true);
@@ -235,7 +237,6 @@ import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfPeertube",
diff --git a/packages/playground/src/weblets/tf_presearch.vue b/packages/playground/src/weblets/tf_presearch.vue
index 0904085636..150e12f286 100644
--- a/packages/playground/src/weblets/tf_presearch.vue
+++ b/packages/playground/src/weblets/tf_presearch.vue
@@ -115,7 +115,6 @@ import { useGrid } from "../stores";
 import { type Flist, ProjectName } from "../types";
 import { deployVM } from "../utils/deploy_vm";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 import { generateName } from "../utils/strings";
 
 const layout = useLayout();
@@ -126,7 +125,7 @@ const ipv4 = ref(false);
 const planetary = ref(true);
 const cpu = 1;
 const memory = 512;
-const rootFilesystemSize = rootFs(cpu, memory);
+const rootFilesystemSize = calculateRootFileSystem({ CPUCores: cpu, RAMInMegaBytes: memory });
 const dockerDiskSize = 10;
 const privateRestoreKey = ref("");
 const publicRestoreKey = ref("");
@@ -212,7 +211,7 @@ function updateSSHkeyEnv(selectedKeys: string) {
 </script>
 
 <script lang="ts">
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 
 import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue";
 import { deploymentListEnvironments } from "../constants";
diff --git a/packages/playground/src/weblets/tf_staticwebsite.vue b/packages/playground/src/weblets/tf_staticwebsite.vue
index 5e9afa0b9d..ff74e8802a 100644
--- a/packages/playground/src/weblets/tf_staticwebsite.vue
+++ b/packages/playground/src/weblets/tf_staticwebsite.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { useLayout } from "../components/weblet_layout.vue";
@@ -131,7 +131,9 @@ const flist: Flist = {
 };
 const dedicated = ref(false);
 const certified = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 function updateSSHkeyEnv(selectedKeys: string) {
@@ -261,7 +263,6 @@ import SelectSolutionFlavor from "../components/select_solution_flavor.vue";
 import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue";
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfStaticWebsite",
diff --git a/packages/playground/src/weblets/tf_subsquid.vue b/packages/playground/src/weblets/tf_subsquid.vue
index d332b63104..818357dbf9 100644
--- a/packages/playground/src/weblets/tf_subsquid.vue
+++ b/packages/playground/src/weblets/tf_subsquid.vue
@@ -85,7 +85,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -113,7 +113,9 @@ const flist: Flist = {
 };
 const dedicated = ref(false);
 const certified = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -222,7 +224,6 @@ import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue"
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfSubsquid",
diff --git a/packages/playground/src/weblets/tf_taiga.vue b/packages/playground/src/weblets/tf_taiga.vue
index f3821870e5..fea3f47e0e 100644
--- a/packages/playground/src/weblets/tf_taiga.vue
+++ b/packages/playground/src/weblets/tf_taiga.vue
@@ -131,7 +131,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref, watch } from "vue";
 
 import { manual } from "@/utils/manual";
@@ -163,7 +163,9 @@ const ipv4 = ref(false);
 const mycelium = ref(true);
 const planetary = ref(true);
 const smtp = ref(createSMTPServer());
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -303,7 +305,6 @@ import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
 import { updateGrid } from "../utils/grid";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TfTaiga",
diff --git a/packages/playground/src/weblets/tf_umbrel.vue b/packages/playground/src/weblets/tf_umbrel.vue
index a7e278405a..77f718db9e 100644
--- a/packages/playground/src/weblets/tf_umbrel.vue
+++ b/packages/playground/src/weblets/tf_umbrel.vue
@@ -128,7 +128,6 @@ import type { Flist, solutionFlavor as SolutionFlavor } from "../types";
 import { ProjectName } from "../types";
 import { deployVM } from "../utils/deploy_vm";
 import { normalizeError } from "../utils/helpers";
-import rootFs from "../utils/root_fs";
 import { generateName, generatePassword } from "../utils/strings";
 
 const layout = useLayout();
@@ -146,7 +145,9 @@ const flist: Flist = {
 };
 const dedicated = ref(false);
 const certified = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const mycelium = ref(true);
 const selectedSSHKeys = ref("");
@@ -217,7 +218,7 @@ function updateSSHkeyEnv(selectedKeys: string) {
 </script>
 
 <script lang="ts">
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 
 import { updateGrid } from "@/utils/grid";
 
diff --git a/packages/playground/src/weblets/tf_wordpress.vue b/packages/playground/src/weblets/tf_wordpress.vue
index 6d6e46626f..1792317f38 100644
--- a/packages/playground/src/weblets/tf_wordpress.vue
+++ b/packages/playground/src/weblets/tf_wordpress.vue
@@ -124,7 +124,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
+import { calculateRootFileSystem, type GridClient } from "@threefold/grid_client";
 import { computed, type Ref, ref } from "vue";
 
 import { updateGrid } from "@/utils/grid";
@@ -155,7 +155,9 @@ const certified = ref(false);
 const ipv4 = ref(false);
 const mycelium = ref(true);
 const planetary = ref(false);
-const rootFilesystemSize = computed(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
+const rootFilesystemSize = computed(() =>
+  calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
+);
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
 const gridStore = useGrid();
@@ -262,7 +264,6 @@ import SelectSolutionFlavor from "../components/select_solution_flavor.vue";
 import ManageSshDeployemnt from "../components/ssh_keys/ManageSshDeployemnt.vue";
 import { deploymentListEnvironments } from "../constants";
 import type { SelectionDetails } from "../types/nodeSelector";
-import rootFs from "../utils/root_fs";
 
 export default {
   name: "TFWordpress",