Skip to content

Commit 5eef099

Browse files
author
Max Rantil
committed
no getVolumeType func
1 parent 17efa60 commit 5eef099

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

test/e2e/suites/e2e/e2e_suite_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func TestE2E(t *testing.T) {
5252

5353
var _ = SynchronizedBeforeSuite(func() []byte {
5454
data := shared.Node1BeforeSuite(e2eCtx)
55-
getVolumeType(e2eCtx)
5655
return data
5756
}, func(data []byte) {
5857
shared.AllNodesBeforeSuite(e2eCtx, data)

test/e2e/suites/e2e/e2e_test.go

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ import (
2828
"strings"
2929
"time"
3030

31-
"github.com/gophercloud/gophercloud"
32-
"github.com/gophercloud/gophercloud/openstack"
3331
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
34-
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumetypes"
3532
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
3633
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers"
3734
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups"
@@ -889,44 +886,3 @@ func isCloudProviderInitialized(taints []corev1.Taint) bool {
889886
}
890887
return true
891888
}
892-
893-
func findVolumeTypeID(volumeClient *gophercloud.ServiceClient, volumeTypeName string) (string, error) {
894-
allPages, err := volumetypes.List(volumeClient, volumetypes.ListOpts{}).AllPages()
895-
if err != nil {
896-
return "", err
897-
}
898-
899-
allVolumeTypes, err := volumetypes.ExtractVolumeTypes(allPages)
900-
if err != nil {
901-
return "", err
902-
}
903-
904-
for _, volumeType := range allVolumeTypes {
905-
if volumeType.Name == volumeTypeName {
906-
return volumeType.ID, nil
907-
}
908-
}
909-
910-
return "", fmt.Errorf("volume type '%s' not found", volumeTypeName)
911-
}
912-
913-
func getVolumeType(e2eCtx *shared.E2EContext) {
914-
providerClient, clientOpts, _, err := shared.GetAdminProviderClient(e2eCtx)
915-
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to get admin provider client: %v", err))
916-
917-
volumeClient, err := openstack.NewBlockStorageV3(providerClient, gophercloud.EndpointOpts{Region: clientOpts.RegionName})
918-
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to create volume client: %v", err))
919-
920-
volumeTypeName := e2eCtx.E2EConfig.GetVariable("OPENSTACK_VOLUME_TYPE_ALT")
921-
Expect(volumeTypeName).NotTo(BeEmpty(), "Volume type name must not be empty")
922-
923-
volumeTypeID, err := findVolumeTypeID(volumeClient, volumeTypeName)
924-
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Error finding volume type '%s': %v", volumeTypeName, err))
925-
926-
shared.Logf("Found volume type ID '%s' for volume type '%s'", volumeTypeID, volumeTypeName)
927-
928-
_, err = volumetypes.Get(volumeClient, volumeTypeID).Extract()
929-
Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Error retrieving volume type with ID '%s': %v", volumeTypeID, err))
930-
931-
shared.Logf("Proceeding with volume type ID '%s'.", volumeTypeID)
932-
}

0 commit comments

Comments
 (0)