check boot of vm with ssh connection

ironcore-dev · Mar 19, 2024 · 8bd9470 · 8bd9470
1 parent f92c101
commit 8bd9470
Show file tree

Hide file tree

Showing 13 changed files with 307 additions and 159 deletions.
diff --git a/provider/server/exec_test.go b/provider/server/exec_test.go
@@ -22,8 +22,7 @@ import (
 	"k8s.io/kubectl/pkg/util/term"
 )
 
-var _ = Describe("Exec", func() {
-
+var _ = Describe("Exec", Ordered, func() {
 	It("should verify an exec-url with a token", func(ctx SpecContext) {
 		By("creating the test machine")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{

diff --git a/provider/server/machine_annotations_update_test.go b/provider/server/machine_annotations_update_test.go
@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("UpdateMachineAnnotations", func() {
+var _ = Describe("UpdateMachineAnnotations", Ordered, func() {
 	It("should update machine annotations", func(ctx SpecContext) {
 		ignitionData := []byte("urjhikmnbdjfkknhhdddeee")
 		By("creating a machine")

diff --git a/provider/server/machine_create_test.go b/provider/server/machine_create_test.go
@@ -14,11 +14,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const (
-	osImage = "ghcr.io/ironcore-dev/ironcore-image/gardenlinux:rootfs-dev-20231206-v1"
-)
-
-var _ = Describe("CreateMachine", func() {
+var _ = Describe("CreateMachine", Ordered, func() {
 	It("should create a machine without boot image, volume and network interface", func(ctx SpecContext) {
 		By("creating a machine without boot image, volume and network interface")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{
@@ -37,6 +33,18 @@ var _ = Describe("CreateMachine", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(createResp).NotTo(BeNil())
 
+		DeferCleanup(func(ctx SpecContext) {
+			Eventually(func(g Gomega) bool {
+				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
+				g.Expect(err).To(SatisfyAny(
+					BeNil(),
+					MatchError(ContainSubstring("NotFound")),
+				))
+				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
+				return libvirt.IsNotFound(err)
+			}).Should(BeTrue())
+		})
+
 		By("ensuring the correct creation response")
 		Expect(createResp).Should(SatisfyAll(
 			HaveField("Machine.Metadata.Id", Not(BeEmpty())),
@@ -53,18 +61,6 @@ var _ = Describe("CreateMachine", func() {
 			HaveField("Machine.Status.NetworkInterfaces", BeNil()),
 		))
 
-		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) bool {
-				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).To(SatisfyAny(
-					BeNil(),
-					MatchError(ContainSubstring("NotFound")),
-				))
-				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
-				return libvirt.IsNotFound(err)
-			}).Should(BeTrue())
-		})
-
 		By("ensuring domain and domain XML is created for machine")
 		var domain libvirt.Domain
 		Eventually(func() error {
@@ -125,7 +121,8 @@ var _ = Describe("CreateMachine", func() {
 					},
 					NetworkInterfaces: []*iri.NetworkInterface{
 						{
-							Name: "nic-1",
+							Name:      "nic-1",
+							NetworkId: networkID.Name,
 						},
 					},
 				},
@@ -134,6 +131,18 @@ var _ = Describe("CreateMachine", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(createResp).NotTo(BeNil())
 
+		DeferCleanup(func(ctx SpecContext) {
+			Eventually(func(g Gomega) bool {
+				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
+				g.Expect(err).To(SatisfyAny(
+					BeNil(),
+					MatchError(ContainSubstring("NotFound")),
+				))
+				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
+				return libvirt.IsNotFound(err)
+			}).Should(BeTrue())
+		})
+
 		By("ensuring the correct creation response")
 		Expect(createResp).Should(SatisfyAll(
 			HaveField("Machine.Metadata.Id", Not(BeEmpty())),
@@ -149,7 +158,8 @@ var _ = Describe("CreateMachine", func() {
 				Device: "oda",
 			})),
 			HaveField("Machine.Spec.NetworkInterfaces", ContainElement(&iri.NetworkInterface{
-				Name: "nic-1",
+				Name:      "nic-1",
+				NetworkId: networkID.Name,
 			})),
 			HaveField("Machine.Status.ObservedGeneration", BeZero()),
 			HaveField("Machine.Status.State", Equal(iri.MachineState_MACHINE_PENDING)),
@@ -158,18 +168,6 @@ var _ = Describe("CreateMachine", func() {
 			HaveField("Machine.Status.NetworkInterfaces", BeNil()),
 		))
 
-		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) bool {
-				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).To(SatisfyAny(
-					BeNil(),
-					MatchError(ContainSubstring("NotFound")),
-				))
-				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
-				return libvirt.IsNotFound(err)
-			}).Should(BeTrue())
-		})
-
 		By("ensuring domain and domain XML is created for machine")
 		var domain libvirt.Domain
 		Eventually(func() error {
@@ -227,7 +225,7 @@ var _ = Describe("CreateMachine", func() {
 				Spec: &iri.MachineSpec{
 					Power: iri.Power_POWER_ON,
 					Image: &iri.ImageSpec{
-						Image: osImage,
+						Image: squashfsOSImage,
 					},
 					Class:        machineClassx3xlarge,
 					IgnitionData: ignitionData,
@@ -242,7 +240,8 @@ var _ = Describe("CreateMachine", func() {
 					},
 					NetworkInterfaces: []*iri.NetworkInterface{
 						{
-							Name: "nic-1",
+							Name:      "nic-1",
+							NetworkId: networkID.Name,
 						},
 					},
 				},
@@ -251,11 +250,23 @@ var _ = Describe("CreateMachine", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(createResp).NotTo(BeNil())
 
+		DeferCleanup(func(ctx SpecContext) {
+			Eventually(func(g Gomega) bool {
+				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
+				g.Expect(err).To(SatisfyAny(
+					BeNil(),
+					MatchError(ContainSubstring("NotFound")),
+				))
+				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
+				return libvirt.IsNotFound(err)
+			}).Should(BeTrue())
+		})
+
 		By("ensuring the correct creation response")
 		Expect(createResp).Should(SatisfyAll(
 			HaveField("Machine.Metadata.Id", Not(BeEmpty())),
 			HaveField("Machine.Spec.Power", iri.Power_POWER_ON),
-			HaveField("Machine.Spec.Image.Image", Equal(osImage)),
+			HaveField("Machine.Spec.Image.Image", Equal(squashfsOSImage)),
 			HaveField("Machine.Spec.Class", machineClassx3xlarge),
 			HaveField("Machine.Spec.IgnitionData", Equal(ignitionData)),
 			HaveField("Machine.Spec.Volumes", ContainElement(&iri.Volume{
@@ -266,7 +277,8 @@ var _ = Describe("CreateMachine", func() {
 				},
 			})),
 			HaveField("Machine.Spec.NetworkInterfaces", ContainElement(&iri.NetworkInterface{
-				Name: "nic-1",
+				Name:      "nic-1",
+				NetworkId: networkID.Name,
 			})),
 			HaveField("Machine.Status.ObservedGeneration", BeZero()),
 			HaveField("Machine.Status.State", Equal(iri.MachineState_MACHINE_PENDING)),
@@ -275,18 +287,6 @@ var _ = Describe("CreateMachine", func() {
 			HaveField("Machine.Status.NetworkInterfaces", BeNil()),
 		))
 
-		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) bool {
-				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).To(SatisfyAny(
-					BeNil(),
-					MatchError(ContainSubstring("NotFound")),
-				))
-				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
-				return libvirt.IsNotFound(err)
-			}).Should(BeTrue())
-		})
-
 		By("ensuring domain and domain XML is created for machine")
 		var domain libvirt.Domain
 		Eventually(func() error {
@@ -343,7 +343,7 @@ var _ = Describe("CreateMachine", func() {
 				Spec: &iri.MachineSpec{
 					Power: iri.Power_POWER_ON,
 					Image: &iri.ImageSpec{
-						Image: osImage,
+						Image: squashfsOSImage,
 					},
 					Class:        machineClassx3xlarge,
 					IgnitionData: ignitionData,
@@ -365,7 +365,8 @@ var _ = Describe("CreateMachine", func() {
 					},
 					NetworkInterfaces: []*iri.NetworkInterface{
 						{
-							Name: "nic-1",
+							Name:      "nic-1",
+							NetworkId: networkID.Name,
 						},
 					},
 				},
@@ -374,11 +375,23 @@ var _ = Describe("CreateMachine", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(createResp).NotTo(BeNil())
 
+		DeferCleanup(func(ctx SpecContext) {
+			Eventually(func(g Gomega) bool {
+				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
+				g.Expect(err).To(SatisfyAny(
+					BeNil(),
+					MatchError(ContainSubstring("NotFound")),
+				))
+				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
+				return libvirt.IsNotFound(err)
+			}).Should(BeTrue())
+		})
+
 		By("ensuring the correct creation response")
 		Expect(createResp).Should(SatisfyAll(
 			HaveField("Machine.Metadata.Id", Not(BeEmpty())),
 			HaveField("Machine.Spec.Power", iri.Power_POWER_ON),
-			HaveField("Machine.Spec.Image.Image", Equal(osImage)),
+			HaveField("Machine.Spec.Image.Image", Equal(squashfsOSImage)),
 			HaveField("Machine.Spec.Class", machineClassx3xlarge),
 			HaveField("Machine.Spec.IgnitionData", Equal(ignitionData)),
 			HaveField("Machine.Spec.Volumes", ContainElements(
@@ -397,7 +410,8 @@ var _ = Describe("CreateMachine", func() {
 					},
 				})),
 			HaveField("Machine.Spec.NetworkInterfaces", ContainElement(&iri.NetworkInterface{
-				Name: "nic-1",
+				Name:      "nic-1",
+				NetworkId: networkID.Name,
 			})),
 			HaveField("Machine.Status.ObservedGeneration", BeZero()),
 			HaveField("Machine.Status.State", Equal(iri.MachineState_MACHINE_PENDING)),
@@ -406,18 +420,6 @@ var _ = Describe("CreateMachine", func() {
 			HaveField("Machine.Status.NetworkInterfaces", BeNil()),
 		))
 
-		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) bool {
-				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).To(SatisfyAny(
-					BeNil(),
-					MatchError(ContainSubstring("NotFound")),
-				))
-				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
-				return libvirt.IsNotFound(err)
-			}).Should(BeTrue())
-		})
-
 		By("ensuring domain and domain XML is created for machine")
 		var domain libvirt.Domain
 		Eventually(func() error {

diff --git a/provider/server/machine_delete_test.go b/provider/server/machine_delete_test.go
@@ -15,30 +15,24 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("DeleteMachine", func() {
-
+var _ = Describe("DeleteMachine", Ordered, func() {
 	It("should delete a machine with graceful shutdown", func(ctx SpecContext) {
 		By("creating a machine using squashfs os image")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{
 			Machine: &iri.Machine{
 				Metadata: &irimeta.ObjectMetadata{
-					Labels: map[string]string{
-						"foo": "bar",
-					},
+					Labels: map[string]string{},
 				},
 				Spec: &iri.MachineSpec{
 					Power: iri.Power_POWER_ON,
 					Image: &iri.ImageSpec{
 						Image: squashfsOSImage,
 					},
 					Class: machineClassx3xlarge,
-					Volumes: []*iri.Volume{
+					NetworkInterfaces: []*iri.NetworkInterface{
 						{
-							Name: "disk-1",
-							EmptyDisk: &iri.EmptyDisk{
-								SizeBytes: emptyDiskSize,
-							},
-							Device: "oda",
+							Name:      "eth0",
+							NetworkId: networkID.Name,
 						},
 					},
 				},
@@ -76,8 +70,9 @@ var _ = Describe("DeleteMachine", func() {
 			return listResp.Machines[0].Status.State
 		}).Should(Equal(iri.MachineState_MACHINE_RUNNING))
 
-		//allow some time for the vm to boot properly
-		time.Sleep(30 * time.Second)
+		Eventually(func(g Gomega) {
+			isDomainVMUpAndRunning(g, libvirtConn, &domain, &networkID)
+		}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 
 		By("deleting the machine")
 		_, err = machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{
@@ -106,7 +101,7 @@ var _ = Describe("DeleteMachine", func() {
 			})
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(listResp.Machines).To(BeEmpty())
-		}).Within(gracefulShutdownTimeout).ProbeEvery(probeEveryInterval).Should(Succeed()) // ProbeEvery has to be ideally less than or equal to half of ResyncIntervalGarbageCollector
+		}).WithTimeout(gracefulShutdownTimeout).WithPolling(pollingIntervalDeletion).Should(Succeed())
 
 		By("ensuring domain and domain XML is deleted for machine")
 		domain, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
@@ -123,23 +118,11 @@ var _ = Describe("DeleteMachine", func() {
 		By("creating a machine which may not boot properly")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{
 			Machine: &iri.Machine{
-				Metadata: &irimeta.ObjectMetadata{
-					Labels: map[string]string{
-						"foo": "bar",
-					},
-				},
+				Metadata: &irimeta.ObjectMetadata{},
 				Spec: &iri.MachineSpec{
-					Power: iri.Power_POWER_ON,
-					Class: machineClassx3xlarge,
-					Volumes: []*iri.Volume{
-						{
-							Name: "disk-1",
-							EmptyDisk: &iri.EmptyDisk{
-								SizeBytes: emptyDiskSize,
-							},
-							Device: "oda",
-						},
-					},
+					Power:             iri.Power_POWER_ON,
+					Class:             machineClassx3xlarge,
+					Volumes:           nil,
 					NetworkInterfaces: nil,
 				},
 			},
@@ -203,7 +186,8 @@ var _ = Describe("DeleteMachine", func() {
 			})
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(listResp.Machines).Should(HaveLen(1))
-		}).WithTimeout(gracefulShutdownTimeout).WithPolling(probeEveryInterval).Should(Succeed())
+			g.Expect(listResp.Machines[0].Status.State).Should(Equal(iri.MachineState_MACHINE_TERMINATING))
+		}).WithTimeout(gracefulShutdownTimeout).WithPolling(pollingIntervalDeletion).Should(Succeed())
 
 		By("ensuring machine is deleted after gracefulShutdownTimeout")
 		Eventually(func(g Gomega) {

diff --git a/provider/server/machine_list_test.go b/provider/server/machine_list_test.go
@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("ListMachine", func() {
+var _ = Describe("ListMachine", Ordered, func() {
 	It("should list machines", func(ctx SpecContext) {
 		By("creating a machine")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{
@@ -25,16 +25,6 @@ var _ = Describe("ListMachine", func() {
 				Spec: &iri.MachineSpec{
 					Power: iri.Power_POWER_ON,
 					Class: machineClassx3xlarge,
-					Volumes: []*iri.Volume{
-						{
-							Name: "disk-1",
-							EmptyDisk: &iri.EmptyDisk{
-								SizeBytes: 5368709120,
-							},
-							Device: "oda",
-						},
-					},
-					NetworkInterfaces: nil,
 				},
 			},
 		})