Merge pull request #992 from shiftstack/mapo-fixes

✨Add InstanceStatus.AvailabilityZone()

Author: k8s-ci-robot

pkg/cloud/services/compute/instance.go

@@ -498,19 +498,18 @@ func (s *Service) GetInstanceStatus(resourceID string) (instance *InstanceStatus
 	if resourceID == "" {
 		return nil, fmt.Errorf("resourceId should be specified to get detail")
 	}
+
 	mc := metrics.NewMetricPrometheusContext("server", "get")
-	server, err := servers.Get(s.computeClient, resourceID).Extract()
+	var server ServerExt
+	err = servers.Get(s.computeClient, resourceID).ExtractInto(&server)
 	if mc.ObserveRequestIgnoreNotFound(err) != nil {
 		if capoerrors.IsNotFound(err) {
 			return nil, nil
 		}
 		return nil, fmt.Errorf("get server %q detail failed: %v", resourceID, err)
 	}
-	if server == nil {
-		return nil, nil
-	}
 
-	return &InstanceStatus{server: server}, nil
+	return &InstanceStatus{server: &server}, nil
 }
 
 func (s *Service) GetInstanceStatusByName(eventObject runtime.Object, name string) (instance *InstanceStatus, err error) {
@@ -531,7 +530,8 @@ func (s *Service) GetInstanceStatusByName(eventObject runtime.Object, name strin
 	if mc.ObserveRequest(err) != nil {
 		return nil, fmt.Errorf("get server list: %v", err)
 	}
-	serverList, err := servers.ExtractServers(allPages)
+	var serverList []ServerExt
+	err = servers.ExtractServersInto(allPages, &serverList)
 	if err != nil {
 		return nil, fmt.Errorf("extract server list: %v", err)
 	}

pkg/cloud/services/compute/instance_types.go

@@ -20,11 +20,18 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 )
 
+// ServerExt is the base gophercloud Server with extensions used by InstanceStatus.
+type ServerExt struct {
+	servers.Server
+	availabilityzones.ServerAvailabilityZoneExt
+}
+
 // InstanceSpec defines the fields which can be set on a new OpenStack instance.
 //
 // InstanceSpec does not contain all of the fields of infrav1.Instance, as not
@@ -55,10 +62,10 @@ type InstanceIdentifier struct {
 
 // InstanceStatus represents instance data which has been returned by OpenStack.
 type InstanceStatus struct {
-	server *servers.Server
+	server *ServerExt
 }
 
-func NewInstanceStatusFromServer(server *servers.Server) *InstanceStatus {
+func NewInstanceStatusFromServer(server *ServerExt) *InstanceStatus {
 	return &InstanceStatus{server}
 }
 
@@ -91,6 +98,10 @@ func (is *InstanceStatus) SSHKeyName() string {
 	return is.server.KeyName
 }
 
+func (is *InstanceStatus) AvailabilityZone() string {
+	return is.server.AvailabilityZone
+}
+
 // APIInstance returns an infrav1.Instance object for use by the API.
 func (is *InstanceStatus) APIInstance() (*infrav1.Instance, error) {
 	i := infrav1.Instance{

test/e2e/shared/openstack.go

@@ -170,7 +170,8 @@ func getOpenStackServers(e2eCtx *E2EContext) (map[string]server, error) {
 		return nil, fmt.Errorf("error listing server: %v", err)
 	}
 
-	serverList, err := servers.ExtractServers(allPages)
+	var serverList []compute.ServerExt
+	err = servers.ExtractServersInto(allPages, &serverList)
 	if err != nil {
 		return nil, fmt.Errorf("error extracting server: %v", err)
 	}