correct testcase

Author: ushabelgur

internal/server/machine.go

@@ -78,11 +78,12 @@ func (s *Server) getIRIVolumeSpec(machine *api.Machine) []*iri.Volume {
 		var connection *iri.VolumeConnection
 		if volumeConnection := volume.Connection; volumeConnection != nil {
 			connection = &iri.VolumeConnection{
-				Driver:         volumeConnection.Driver,
-				Handle:         volumeConnection.Handle,
-				Attributes:     volumeConnection.Attributes,
-				SecretData:     volumeConnection.SecretData,
-				EncryptionData: volumeConnection.EncryptionData,
+				Driver:                volumeConnection.Driver,
+				Handle:                volumeConnection.Handle,
+				Attributes:            volumeConnection.Attributes,
+				SecretData:            volumeConnection.SecretData,
+				EncryptionData:        volumeConnection.EncryptionData,
+				EffectiveStorageBytes: volumeConnection.EffectiveStorageBytes,
 			}
 		}
 

internal/server/machine_volume_update_test.go

@@ -18,7 +18,7 @@ import (
 
 var _ = FDescribe("UpdateVolume", func() {
 	It("should correctly update machine volume", func(ctx SpecContext) {
-		By("creating a machine with empty disks and single ceph volume")
+		By("creating a machine with ceph volume")
 		createResp, err := machineClient.CreateMachine(ctx, &iri.CreateMachineRequest{
 			Machine: &iri.Machine{
 				Metadata: &irimeta.ObjectMetadata{
@@ -33,16 +33,9 @@ var _ = FDescribe("UpdateVolume", func() {
 					},
 					Class: machineClassx3xlarge,
 					Volumes: []*iri.Volume{
-						{
-							Name: "disk-1",
-							EmptyDisk: &iri.EmptyDisk{
-								SizeBytes: emptyDiskSize,
-							},
-							Device: "oda",
-						},
 						{
 							Name:   "volume-1",
-							Device: "odc",
+							Device: "oda",
 							Connection: &iri.VolumeConnection{
 								Driver: "ceph",
 								Handle: "dummy",
@@ -106,11 +99,6 @@ var _ = FDescribe("UpdateVolume", func() {
 			return listResp.Machines[0].Status
 		}).Should(SatisfyAll(
 			HaveField("Volumes", ContainElements(
-				&iri.VolumeStatus{
-					Name:   "disk-1",
-					Handle: "libvirt-provider.ironcore.dev/empty-disk/disk-1",
-					State:  iri.VolumeState_VOLUME_ATTACHED,
-				},
 				&iri.VolumeStatus{
 					Name:   "volume-1",
 					Handle: "libvirt-provider.ironcore.dev/ceph/libvirt-provider.ironcore.dev/ceph^dummy",
@@ -128,9 +116,8 @@ var _ = FDescribe("UpdateVolume", func() {
 			g.Expect(domainXML.Unmarshal(domainXMLData)).Should(Succeed())
 			disks = domainXML.Devices.Disks
 			return len(disks)
-		}).Should(Equal(3))
+		}).Should(Equal(2))
 		Expect(disks[0].Serial).To(HavePrefix("oda"))
-		Expect(disks[1].Serial).To(HavePrefix("odc"))
 
 		// wait to complete machine reconciliation
 		time.Sleep(20 * time.Second)
@@ -140,7 +127,7 @@ var _ = FDescribe("UpdateVolume", func() {
 			MachineId: createResp.Machine.Metadata.Id,
 			Volume: &iri.Volume{
 				Name:   "volume-1",
-				Device: "odc",
+				Device: "oda",
 				Connection: &iri.VolumeConnection{
 					Driver: "ceph",
 					Handle: "dummy",
@@ -159,12 +146,11 @@ var _ = FDescribe("UpdateVolume", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(updateVolumeResp).NotTo(BeNil())
 
-		By("ensuring volume-1 is updated")
 		// wait to complete machine reconciliation
 		time.Sleep(20 * time.Second)
 
 		By("ensuring volume-1 has been updated in machine spec field")
-		Eventually(func(g Gomega) *iri.MachineSpec {
+		Eventually(func(g Gomega) *iri.Volume {
 			listResp, err := machineClient.ListMachines(ctx, &iri.ListMachinesRequest{
 				Filter: &iri.MachineFilter{
 					Id: createResp.Machine.Metadata.Id,
@@ -173,33 +159,11 @@ var _ = FDescribe("UpdateVolume", func() {
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(listResp.Machines).NotTo(BeEmpty())
 			g.Expect(listResp.Machines).Should(HaveLen(1))
-			return listResp.Machines[0].Spec
+			return listResp.Machines[0].Spec.Volumes[0]
 		}).Should(SatisfyAll(
-			HaveField("Volumes", ContainElements(
-				&iri.Volume{
-					Name: "disk-1",
-					EmptyDisk: &iri.EmptyDisk{
-						SizeBytes: emptyDiskSize,
-					},
-					Device: "oda",
-				},
-				&iri.Volume{
-					Name:   "volume-1",
-					Device: "odc",
-					Connection: &iri.VolumeConnection{
-						Driver: "ceph",
-						Handle: "dummy",
-						Attributes: map[string]string{
-							"image":    cephImage,
-							"monitors": cephMonitors,
-						},
-						SecretData: map[string][]byte{
-							"userID":  []byte(cephUsername),
-							"userKey": []byte(cephUserkey),
-						},
-						EffectiveStorageBytes: resource.NewQuantity(2*1024*1024*1024, resource.BinarySI).Value(),
-					},
-				})),
+			HaveField("Name", Equal("volume-1")),
+			HaveField("Device", Equal("oda")),
+			HaveField("Connection.EffectiveStorageBytes", Equal(resource.NewQuantity(2*1024*1024*1024, resource.BinarySI).Value())),
 		))
 	})
 })