Skip to content
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

Jump to bottom

Fix getting instance availability zone from Nova #405

Merged
merged 1 commit into from
Dec 18, 2018
Merged

Fix getting instance availability zone from Nova #405

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 16 additions & 10 deletions pkg/cloudprovider/providers/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
"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/servers"
"github.com/gophercloud/gophercloud/openstack/identity/v3/extensions/trusts"
tokens3 "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
Expand Down Expand Up @@ -136,6 +137,11 @@ type MetadataOpts struct {
RequestTimeout MyDuration `gcfg:"request-timeout"`
}

type ServerAttributesExt struct {
servers.Server
availabilityzones.ServerAvailabilityZoneExt
}

// OpenStack is an implementation of cloud provider Interface for OpenStack.
type OpenStack struct {
provider *gophercloud.ProviderClient
Expand Down Expand Up @@ -437,18 +443,18 @@ func foreachServer(client *gophercloud.ServiceClient, opts servers.ListOptsBuild
return err
}

func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*servers.Server, error) {
func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*ServerAttributesExt, error) {
opts := servers.ListOpts{
Name: fmt.Sprintf("^%s$", regexp.QuoteMeta(mapNodeNameToServerName(name))),
}

pager := servers.List(client, opts)

serverList := make([]servers.Server, 0, 1)
var s []ServerAttributesExt
serverList := make([]ServerAttributesExt, 0, 1)

err := pager.EachPage(func(page pagination.Page) (bool, error) {
s, err := servers.ExtractServers(page)
if err != nil {
if err := servers.ExtractServersInto(page, &s); err != nil {
return false, err
}
serverList = append(serverList, s...)
Expand Down Expand Up @@ -540,7 +546,7 @@ func getAddressesByName(client *gophercloud.ServiceClient, name types.NodeName,
return nil, err
}

return nodeAddresses(srv, networkingOpts)
return nodeAddresses(&srv.Server, networkingOpts)
}

func getAddressByName(client *gophercloud.ServiceClient, name types.NodeName, needIPv6 bool, networkingOpts NetworkingOpts) (string, error) {
Expand Down Expand Up @@ -698,16 +704,16 @@ func (os *OpenStack) GetZoneByProviderID(ctx context.Context, providerID string)
return cloudprovider.Zone{}, err
}

srv, err := servers.Get(compute, instanceID).Extract()
if err != nil {
var serverWithAttributesExt ServerAttributesExt
if err := servers.Get(compute, instanceID).ExtractInto(&serverWithAttributesExt); err != nil {
return cloudprovider.Zone{}, err
}

zone := cloudprovider.Zone{
FailureDomain: srv.Metadata[availabilityZone],
FailureDomain: serverWithAttributesExt.AvailabilityZone,
Region: os.region,
}
klog.V(4).Infof("The instance %s in zone %v", srv.Name, zone)
klog.V(4).Infof("The instance %s in zone %v", serverWithAttributesExt.Name, zone)
return zone, nil
}

Expand All @@ -729,7 +735,7 @@ func (os *OpenStack) GetZoneByNodeName(ctx context.Context, nodeName types.NodeN
}

zone := cloudprovider.Zone{
FailureDomain: srv.Metadata[availabilityZone],
FailureDomain: srv.AvailabilityZone,
Region: os.region,
}
klog.V(4).Infof("The instance %s in zone %v", srv.Name, zone)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/openstack/openstack_instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func (i *Instances) InstanceType(ctx context.Context, name types.NodeName) (stri
return "", err
}

return srvInstanceType(srv)
return srvInstanceType(&srv.Server)
}

func srvInstanceType(srv *servers.Server) (string, error) {
Expand Down