Make it able to bring your own OpenStack volume

Signed-off-by: Max Rantil <[email protected]>

Author: Max Rantil

hack/ci/cloud-init/controller.yaml.tpl

@@ -150,6 +150,15 @@
         openstack aggregate add host "$aggregateid" "$host"
     done
 
+    # Create the volume type and directly fetch the ID
+    VOLUME_TYPE_NAME="test-volume-type"
+    VOLUME_TYPE_ID=$(openstack volume type create --description "Test volume type" --public "${VOLUME_TYPE_NAME}" -f value -c id)
+    if [[ ! -z "${VOLUME_TYPE_ID}" ]]; then
+        echo "Volume type '${VOLUME_TYPE_NAME}' created successfully with ID: ${VOLUME_TYPE_ID}"
+    else
+        echo "Error: Failed to create volume type '${VOLUME_TYPE_NAME}'."
+    fi
+
     # the flavors are created in a way that we can execute at least 2 e2e tests in parallel (overall we have 32 vCPUs)
     openstack flavor delete m1.tiny
     openstack flavor create --ram 512 --disk 1 --ephemeral 1 --vcpus 1 --public --id 1 m1.tiny --property hw_rng:allowed='True'

test/e2e/suites/e2e/e2e_suite_test.go

@@ -52,7 +52,7 @@ func TestE2E(t *testing.T) {
 
 var _ = SynchronizedBeforeSuite(func() []byte {
 	data := shared.Node1BeforeSuite(e2eCtx)
-	createTestVolumeType(e2eCtx)
+	getVolumeType(e2eCtx)
 	return data
 }, func(data []byte) {
 	shared.AllNodesBeforeSuite(e2eCtx, data)

test/e2e/suites/e2e/e2e_test.go

@@ -57,7 +57,6 @@ import (
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
-	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 	"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
 )
 
@@ -891,23 +890,43 @@ func isCloudProviderInitialized(taints []corev1.Taint) bool {
 	return true
 }
 
-func createTestVolumeType(e2eCtx *shared.E2EContext) {
+func findVolumeTypeID(volumeClient *gophercloud.ServiceClient, volumeTypeName string) (string, error) {
+	allPages, err := volumetypes.List(volumeClient, volumetypes.ListOpts{}).AllPages()
+	if err != nil {
+		return "", err
+	}
+
+	allVolumeTypes, err := volumetypes.ExtractVolumeTypes(allPages)
+	if err != nil {
+		return "", err
+	}
+
+	for _, volumeType := range allVolumeTypes {
+		if volumeType.Name == volumeTypeName {
+			return volumeType.ID, nil
+		}
+	}
+
+	return "", fmt.Errorf("volume type '%s' not found", volumeTypeName)
+}
+
+func getVolumeType(e2eCtx *shared.E2EContext) {
 	providerClient, clientOpts, _, err := shared.GetAdminProviderClient(e2eCtx)
-	Expect(err).NotTo(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to get admin provider client: %v", err))
 
 	volumeClient, err := openstack.NewBlockStorageV3(providerClient, gophercloud.EndpointOpts{Region: clientOpts.RegionName})
-	Expect(err).NotTo(HaveOccurred())
-
-	shared.Logf("Creating test volume type")
-	_, err = volumetypes.Create(volumeClient, &volumetypes.CreateOpts{
-		Name:        e2eCtx.E2EConfig.GetVariable(shared.OpenStackVolumeTypeAlt),
-		Description: "Test volume type",
-		IsPublic:    pointer.Bool(true),
-		ExtraSpecs:  map[string]string{},
-	}).Extract()
-	if capoerrors.IsConflict(err) {
-		shared.Logf("Volume type already exists. This may happen in development environments, but it is not expected in CI.")
-		return
-	}
-	Expect(err).NotTo(HaveOccurred())
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to create volume client: %v", err))
+
+	volumeTypeName := e2eCtx.E2EConfig.GetVariable("OPENSTACK_VOLUME_TYPE_ALT")
+	Expect(volumeTypeName).NotTo(BeEmpty(), "Volume type name must not be empty")
+
+	volumeTypeID, err := findVolumeTypeID(volumeClient, volumeTypeName)
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Error finding volume type '%s': %v", volumeTypeName, err))
+
+	shared.Logf("Found volume type ID '%s' for volume type '%s'", volumeTypeID, volumeTypeName)
+
+	_, err = volumetypes.Get(volumeClient, volumeTypeID).Extract()
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Error retrieving volume type with ID '%s': %v", volumeTypeID, err))
+
+	shared.Logf("Proceeding with volume type ID '%s'.", volumeTypeID)
 }