test/e2e/common.go: fix disk_offering_test.go

    • [FAILED] [292.946 seconds]
    When testing with disk offering [It] Should successfully create a cluster with disk offering
    /data/git/cluster-api-provider-cloudstack/test/e2e/disk_offering.go:60

    [FAILED] Expected
        <string>:
    to equal
        <string>: Small
    In [It] at: /data/git/cluster-api-provider-cloudstack/test/e2e/common.go:515

The error is because diskofferingname of VM is not the offering name of DATA disks.
It is the offering name of ROOT disk only when the VM is created from ISO.

The test passes if check the offering name of DATA disks instead.

Author: weizhouapache

test/e2e/common.go

@@ -512,7 +512,17 @@ func CheckDiskOfferingOfVmInstances(client *cloudstack.CloudStackClient, cluster
 	}
 	for _, vm := range listResp.VirtualMachines {
 		if strings.Contains(vm.Name, clusterName) {
-			Expect(vm.Diskofferingname).To(Equal(diskOfferingName))
+			p := client.Volume.NewListVolumesParams()
+			p.SetVirtualmachineid(vm.Id)
+			volResp, err := client.Volume.ListVolumes(p)
+			if err != nil {
+				Fail(fmt.Sprintf("Failed to list volumes for VM instance %s", vm.Id))
+			}
+			for _, vol := range volResp.Volumes {
+				if strings.Contains(vol.Name, DataVolumePrefix) {
+					Expect(vol.Diskofferingname).To(Equal(diskOfferingName))
+				}
+			}
 		}
 	}
 }