Merge pull request #3512 from threefoldtech/development_update_tests_…

…to_mycelium
threefoldtech · Oct 17, 2024 · 6082a60 · 6082a60
2 parents fccc6af + d052850
commit 6082a60
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 18 deletions.
diff --git a/.github/workflows/grid_client_tests.yml b/.github/workflows/grid_client_tests.yml
@@ -48,6 +48,13 @@ jobs:
           sudo  sed -i -- 's/Peers\: \[\]/Peers: [\n'"$PEERS"']/g' /etc/yggdrasil/yggdrasil.conf
           sudo systemctl stop yggdrasil
           sudo systemctl start yggdrasil
+      - name: Install Mycelium
+        run: |
+          sudo apt-get update
+          wget https://github.com/threefoldtech/mycelium/releases/download/v0.5.6/mycelium-x86_64-unknown-linux-musl.tar.gz
+          tar -xvf mycelium-x86_64-unknown-linux-musl.tar.gz
+          mv mycelium /usr/local/bin
+          sudo mycelium --peers tcp://188.40.132.242:9651 quic://185.69.166.8:9651 --tun-name utun9 &
       - name: Generate SSH Key
         run: |
           ssh-keygen -t ed25519 -N '' -f ~/.ssh/id_ed25519

diff --git a/packages/grid_client/tests/README.md b/packages/grid_client/tests/README.md
@@ -42,3 +42,5 @@ yarn test --runInBand
 > `--coverage`: Collect and report coverage.
 > `--colors`: Force colorful output.
 > `--forceExit`: Force the process to exit after tests complete.
+> 
+> **Note:** Some tests are using Mycelium for the SSH connection, which is why it is important for Mycelium to be running.
diff --git a/packages/grid_client/tests/modules/kubernetes.test.ts b/packages/grid_client/tests/modules/kubernetes.test.ts
@@ -159,7 +159,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
         public_ip: masterPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     workers: [
@@ -173,7 +173,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
         public_ip: workerPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: metadata,
@@ -196,6 +196,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
   expect(result.masters[0].nodeId).toBe(masterNodeId);
   expect(result.masters[0].status).toBe("ok");
   expect(result.masters[0].planetary).toBeDefined();
+  expect(result.masters[0].myceliumIP).toBeDefined();
   expect(result.masters[0].publicIP).toBeNull();
   expect(result.masters[0].interfaces[0]["network"]).toBe(networkName);
   expect(result.masters[0].interfaces[0]["ip"]).toContain(splitIP(ipRange));
@@ -211,6 +212,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
   expect(result.workers[0].nodeId).toBe(workerNodeId);
   expect(result.workers[0].status).toBe("ok");
   expect(result.workers[0].planetary).toBeDefined();
+  expect(result.workers[0].myceliumIP).toBeDefined();
   expect(result.workers[0].publicIP).toBeNull();
   expect(result.workers[0].interfaces[0]["network"]).toBe(networkName);
   expect(result.workers[0].interfaces[0]["ip"]).toContain(splitIP(ipRange));
@@ -285,7 +287,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
   }
 });
 
-test("TC1232 - Kubernetes: Add Worker", async () => {
+test.skip("TC1232 - Kubernetes: Add Worker", async () => {
   /**********************************************
      Test Suite: Grid3_Client_TS (Automated)
      Test Cases: TC1232 - Kubernetes: Add Worker
@@ -425,7 +427,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
         public_ip: masterPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     workers: [
@@ -439,7 +441,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
         public_ip: workerPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: metadata,
@@ -459,7 +461,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
     public_ip: workerPublicIp,
     public_ip6: false,
     planetary: true,
-    mycelium: false,
+    mycelium: true,
   };
 
   const res = await gridClient.k8s.deploy(k8s);
@@ -491,6 +493,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
   expect(newResult.workers[1].nodeId).toBe(workerNodeId);
   expect(newResult.workers[1].status).toBe("ok");
   expect(newResult.workers[1].planetary).toBeDefined();
+  expect(newResult.workers[1].myceliumIP).toBeDefined();
   expect(newResult.workers[1].publicIP).toBeNull();
   expect(newResult.workers[1].interfaces[0]["network"]).toBe(networkName);
   expect(newResult.workers[1].interfaces[0]["ip"]).toContain(splitIP(ipRange));
@@ -679,7 +682,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
         public_ip: masterPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     workers: [
@@ -693,7 +696,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
         public_ip: workerPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: metadata,

diff --git a/packages/grid_client/tests/modules/qsfs.test.ts b/packages/grid_client/tests/modules/qsfs.test.ts
@@ -199,7 +199,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
         entrypoint: "/sbin/zinit init",
         public_ip: publicIP,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         qsfs_disks: [
           {
             qsfs_zdbs_name: qsfsZdbName,
@@ -250,6 +250,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
   expect(result[0].capacity["cpu"]).toBe(cpu);
   expect(result[0].capacity["memory"]).toBe(memory);
   expect(result[0].planetary).toBeDefined();
+  expect(result[0].myceliumIP).toBeDefined();
   expect(result[0].publicIP).toBeNull();
   expect(result[0].description).toBe(description);
 
@@ -537,7 +538,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
         public_ip: masterPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         qsfs_disks: qsfsDisk,
       },
     ],
@@ -552,7 +553,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
         public_ip: workerPublicIp,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: metadata,
@@ -575,6 +576,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
   expect(result.masters[0].nodeId).toBe(masterNodeId);
   expect(result.masters[0].status).toBe("ok");
   expect(result.masters[0].planetary).toBeDefined();
+  expect(result.masters[0].myceliumIP).toBeDefined();
   expect(result.masters[0].publicIP).toBeNull();
   expect(result.masters[0].interfaces[0]["network"]).toBe(networkName);
   expect(result.masters[0].interfaces[0]["ip"]).toContain(splitIP(ipRange));
@@ -599,6 +601,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
   expect(result.workers[0].nodeId).toBe(workerNodeId);
   expect(result.workers[0].status).toBe("ok");
   expect(result.workers[0].planetary).toBeDefined();
+  expect(result.workers[0].myceliumIP).toBeDefined();
   expect(result.workers[0].publicIP).toBeNull();
   expect(result.workers[0].interfaces[0]["network"]).toBe(networkName);
   expect(result.workers[0].interfaces[0]["ip"]).toContain(splitIP(ipRange));
@@ -648,9 +651,9 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
     await masterSSH.execCommand("df -h").then(async function (result) {
       const splittedRes = result.stdout.split("\n");
       log(result.stdout);
-      log(splittedRes[6]);
-      expect(splittedRes[6]).toContain(qsfsName);
-      expect(splittedRes[6]).toContain(qsfsMountPoint);
+      log(splittedRes[5]);
+      expect(splittedRes[5]).toContain(qsfsName);
+      expect(splittedRes[5]).toContain(qsfsMountPoint);
     });
   } finally {
     //Disconnect from the master