fix: use myceliumIp instead of planetryIp

threefoldtech · Oct 2, 2024 · 549d404 · 549d404
1 parent 781df78
commit 549d404
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/grid-client/integration_tests/batch_k8s_test.go b/grid-client/integration_tests/batch_k8s_test.go
@@ -131,14 +131,14 @@ func TestBatchK8sDeployment(t *testing.T) {
 	require.Equal(t, len(k1.Workers), 1)
 
 	// Check that master is reachable
-	require.NotEmpty(t, k1.Master.PlanetaryIP)
+	require.NotEmpty(t, k1.Master.MyceliumIP)
 	require.NotEmpty(t, k1.Master.IP)
 	require.NotEqual(t, k1.Master.IP, k1.Workers[0].IP)
 
-	require.True(t, CheckConnection(k1.Workers[0].PlanetaryIP, "22"))
+	require.True(t, CheckConnection(k1.Workers[0].MyceliumIP, "22"))
 
 	// ssh to master node
-	require.NoError(t, requireNodesAreReady(len(k1.Workers)+1, k1.Master.PlanetaryIP, privateKey))
+	require.NoError(t, requireNodesAreReady(len(k1.Workers)+1, k1.Master.MyceliumIP, privateKey))
 
 	// cluster 2
 	k2, err := tfPluginClient.State.LoadK8sFromGrid(context.Background(), []uint32{nodeID2}, k8sCluster2.Master.Name)
@@ -148,14 +148,14 @@ func TestBatchK8sDeployment(t *testing.T) {
 	require.Equal(t, len(k2.Workers), 1)
 
 	// Check that master is reachable
-	require.NotEmpty(t, k1.Master.PlanetaryIP)
+	require.NotEmpty(t, k1.Master.MyceliumIP)
 	require.NotEmpty(t, k1.Master.IP)
 	require.NotEqual(t, k1.Master.IP, k2.Workers[0].IP)
 
 	require.True(t, CheckConnection(k2.Workers[0].MyceliumIP, "22"))
 
 	// ssh to master node
-	require.NoError(t, requireNodesAreReady(len(k2.Workers)+1, k2.Master.PlanetaryIP, privateKey))
+	require.NoError(t, requireNodesAreReady(len(k2.Workers)+1, k2.Master.MyceliumIP, privateKey))
 
 	// different ips generated
 	require.Equal(t, len(slices.Compact[[]string, string]([]string{k1.Master.IP, k2.Master.IP, k1.Workers[0].IP, k2.Workers[0].IP})), 4)

diff --git a/grid-client/integration_tests/batch_vm_test.go b/grid-client/integration_tests/batch_vm_test.go
@@ -79,17 +79,17 @@ func TestBatchVMDeployment(t *testing.T) {
 
 	v1, err := tfPluginClient.State.LoadVMFromGrid(context.Background(), nodeID1, vm1.Name, dl1.Name)
 	require.NoError(t, err)
-	require.NotEmpty(t, v1.PlanetaryIP)
+	require.NotEmpty(t, v1.MyceliumIP)
 
-	output, err := RemoteRun("root", v1.PlanetaryIP, "ls /", privateKey)
+	output, err := RemoteRun("root", v1.MyceliumIP, "ls /", privateKey)
 	require.NoError(t, err)
 	require.Contains(t, output, "root")
 
 	v2, err := tfPluginClient.State.LoadVMFromGrid(context.Background(), nodeID2, vm2.Name, dl2.Name)
 	require.NoError(t, err)
-	require.NotEmpty(t, v2.PlanetaryIP)
+	require.NotEmpty(t, v2.MyceliumIP)
 
-	output, err = RemoteRun("root", v2.PlanetaryIP, "ls /", privateKey)
+	output, err = RemoteRun("root", v2.MyceliumIP, "ls /", privateKey)
 	require.NoError(t, err)
 	require.Contains(t, output, "root")
 }