Skip to content

[cleanup] use gophercloud/utils to list available AZs #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 9, 2021
Merged

[cleanup] use gophercloud/utils to list available AZs #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions pkg/cloud/openstack/clients/machineservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
"github.com/gophercloud/gophercloud/openstack/common/extensions"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
Expand All @@ -49,6 +48,7 @@ import (
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
"github.com/gophercloud/gophercloud/pagination"
"github.com/gophercloud/utils/openstack/clientconfig"
azutils "github.com/gophercloud/utils/openstack/compute/v2/availabilityzones"
flavorutils "github.com/gophercloud/utils/openstack/compute/v2/flavors"
imageutils "github.com/gophercloud/utils/openstack/imageservice/v2/images"
configclient "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
Expand Down Expand Up @@ -886,7 +886,7 @@ func (is *InstanceService) DoesAvailabilityZoneExist(azName string) error {
if azName == "" {
return nil
}
zones, err := ListAvailableAvailabilityZones(is.computeClient)
zones, err := azutils.ListAvailableAvailabilityZones(is.computeClient)
if err != nil {
return err
}
Expand All @@ -901,28 +901,6 @@ func (is *InstanceService) DoesAvailabilityZoneExist(azName string) error {
return fmt.Errorf("could not find compute availability zone: %s", azName)
}

// ListAvailableAvailabilityZones is a convenience function that return a slice of available Availability Zones.
// TODO: remove that function once we bump gophercloud/utils that containers this helper.
func ListAvailableAvailabilityZones(client *gophercloud.ServiceClient) ([]string, error) {
var ret []string
allPages, err := availabilityzones.List(client).AllPages()
if err != nil {
return ret, err
}

availabilityZoneInfo, err := availabilityzones.ExtractAvailabilityZones(allPages)
if err != nil {
return ret, err
}

for _, zoneInfo := range availabilityZoneInfo {
if zoneInfo.ZoneState.Available {
ret = append(ret, zoneInfo.ZoneName)
}
}
return ret, nil
}

func (is *InstanceService) GetInstance(resourceId string) (instance *Instance, err error) {
if resourceId == "" {
return nil, fmt.Errorf("ResourceId should be specified to get detail.")
Expand Down
27 changes: 27 additions & 0 deletions vendor/github.com/gophercloud/utils/openstack/compute/v2/availabilityzones/utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ github.com/gophercloud/utils/env
github.com/gophercloud/utils/gnocchi
github.com/gophercloud/utils/internal
github.com/gophercloud/utils/openstack/clientconfig
github.com/gophercloud/utils/openstack/compute/v2/availabilityzones
github.com/gophercloud/utils/openstack/compute/v2/flavors
github.com/gophercloud/utils/openstack/imageservice/v2/images
# github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
Expand Down