Tolerate Flavor information for computing instance type

Current devstack seems to return "id", and an upcoming change using nova's microversion will be returning "original_name": https://blueprints.launchpad.net/nova/+spec/instance-flavor-api So let's just inspect what is present and use that to figure out the instance type.

Tolerate Flavor information for computing instance type
c197e623 · Davanum Srinivas · ebf24c14 · c197e623
Commit c197e623 authored Jul 19, 2017 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 12 deletions

openstack_instances.go pkg/cloudprovider/providers/openstack/openstack_instances.go +10 -12

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_instances.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go
@@ -188,19 +188,17 @@ func (i *Instances) InstanceType(name types.NodeName) (string, error) {
 }
 func srvInstanceType(srv *servers.Server) (string, error) {
-	val, ok := srv.Flavor["name"]
+	keys := []string{"name", "id", "original_name"}
+	for _, key := range keys {
-	if !ok {
+		val, found := srv.Flavor[key]
-		return "", fmt.Errorf("flavor name not present in server info")
+		if found {
-	}
+			flavor, ok := val.(string)
+			if ok {
-	flavor, ok := val.(string)
+				return flavor, nil
+			}
-	if !ok {
+		}
-		return "", fmt.Errorf("flavor name is not a string")
 	}
+	return "", fmt.Errorf("flavor name/id not found")
-	return flavor, nil
 }
 func instanceIDFromProviderID(providerID string) (instanceID string, err error) {