Handle nova api version > 2.87 for hypervisor

Samuel Allan · Samuel Allan · commit 24aa11db1aec · 2024-05-29T16:35:03.000+09:30
fixes: #3026
diff --git a/openstack/compute/v2/hypervisors/results.go b/openstack/compute/v2/hypervisors/results.go
@@ -158,27 +158,31 @@ func (r *Hypervisor) UnmarshalJSON(b []byte) error {
 
 	*r = Hypervisor(s.tmp)
 
-	// Newer versions return the CPU info as the correct type.
-	// Older versions return the CPU info as a string and need to be
-	// unmarshalled by the json parser.
-	var tmpb []byte
-
-	switch t := s.CPUInfo.(type) {
-	case string:
-		tmpb = []byte(t)
-	case map[string]any:
-		tmpb, err = json.Marshal(t)
-		if err != nil {
-			return err
+	// cpu_info doesn't exist after api version 2.87,
+	// see https://docs.openstack.org/api-ref/compute/#id288
+	if s.CPUInfo != nil {
+		// api versions 2.28 to 2.87 return the CPU info as the correct type.
+		// api versions < 2.28 return the CPU info as a string and need to be
+		// unmarshalled by the json parser.
+		var tmpb []byte
+
+		switch t := s.CPUInfo.(type) {
+		case string:
+			tmpb = []byte(t)
+		case map[string]any:
+			tmpb, err = json.Marshal(t)
+			if err != nil {
+				return err
+			}
+		default:
+			return fmt.Errorf("CPUInfo has unexpected type: %T", t)
 		}
-	default:
-		return fmt.Errorf("CPUInfo has unexpected type: %T", t)
-	}
 
-	if len(tmpb) != 0 {
-		err = json.Unmarshal(tmpb, &r.CPUInfo)
-		if err != nil {
-			return err
+		if len(tmpb) != 0 {
+			err = json.Unmarshal(tmpb, &r.CPUInfo)
+			if err != nil {
+				return err
+			}
 		}
 	}
 
@@ -193,22 +197,28 @@ func (r *Hypervisor) UnmarshalJSON(b []byte) error {
 		return fmt.Errorf("Hypervisor version has unexpected type: %T", t)
 	}
 
-	switch t := s.FreeDiskGB.(type) {
-	case int:
-		r.FreeDiskGB = t
-	case float64:
-		r.FreeDiskGB = int(t)
-	default:
-		return fmt.Errorf("Free disk GB has unexpected type: %T", t)
+	// free_disk_gb doesn't exist after api version 2.87
+	if s.FreeDiskGB != nil {
+		switch t := s.FreeDiskGB.(type) {
+		case int:
+			r.FreeDiskGB = t
+		case float64:
+			r.FreeDiskGB = int(t)
+		default:
+			return fmt.Errorf("Free disk GB has unexpected type: %T", t)
+		}
 	}
 
-	switch t := s.LocalGB.(type) {
-	case int:
-		r.LocalGB = t
-	case float64:
-		r.LocalGB = int(t)
-	default:
-		return fmt.Errorf("Local GB has unexpected type: %T", t)
+	// local_gb doesn't exist after api version 2.87
+	if s.LocalGB != nil {
+		switch t := s.LocalGB.(type) {
+		case int:
+			r.LocalGB = t
+		case float64:
+			r.LocalGB = int(t)
+		default:
+			return fmt.Errorf("Local GB has unexpected type: %T", t)
+		}
 	}
 
 	// OpenStack Compute service returns ID in string representation since
