Phase 1 - Refactor PowerVS Machine Spec (#1035)

* Refactor PVS Specs: change SysType to SystemType

Signed-off-by: Prajyot-Parab <[email protected]>

* Refactor PVS Specs: change ProcType to ProcessorType

Signed-off-by: Prajyot-Parab <[email protected]>

* Refactor PVS Specs: change type of Processors field

Signed-off-by: Prajyot-Parab <[email protected]>

* Refactor PVS Specs: change Memory to MemoryGiB

Signed-off-by: Prajyot-Parab <[email protected]>

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

api/v1beta1/ibmpowervs_conversion.go

@@ -17,6 +17,13 @@ limitations under the License.
 package v1beta1
 
 import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/util/intstr"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
@@ -141,3 +148,48 @@ func (dst *IBMPowerVSImageList) ConvertFrom(srcRaw conversion.Hub) error {
 
 	return Convert_v1beta2_IBMPowerVSImageList_To_v1beta1_IBMPowerVSImageList(src, dst, nil)
 }
+
+func Convert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in *IBMPowerVSMachineSpec, out *infrav1beta2.IBMPowerVSMachineSpec, s apiconversion.Scope) error {
+	out.SystemType = in.SysType
+	out.Processors = intstr.FromString(in.Processors)
+
+	memory, err := strconv.ParseFloat(in.Memory, 64)
+	if err != nil {
+		return fmt.Errorf("failed to convert memory(%s) to float64", in.Memory)
+	}
+	out.MemoryGiB = int32(memory)
+
+	switch in.ProcType {
+	case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeDedicated)):
+		out.ProcessorType = infrav1beta2.PowerVSProcessorTypeDedicated
+	case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeShared)):
+		out.ProcessorType = infrav1beta2.PowerVSProcessorTypeShared
+	case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeCapped)):
+		out.ProcessorType = infrav1beta2.PowerVSProcessorTypeCapped
+	}
+
+	return autoConvert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in, out, s)
+}
+
+func Convert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in *infrav1beta2.IBMPowerVSMachineSpec, out *IBMPowerVSMachineSpec, s apiconversion.Scope) error {
+	out.SysType = in.SystemType
+	out.Memory = strconv.FormatInt(int64(in.MemoryGiB), 10)
+
+	switch in.Processors.Type {
+	case intstr.Int:
+		out.Processors = strconv.FormatInt(int64(in.Processors.IntVal), 10)
+	case intstr.String:
+		out.Processors = in.Processors.StrVal
+	}
+
+	switch in.ProcessorType {
+	case infrav1beta2.PowerVSProcessorTypeDedicated:
+		out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeDedicated))
+	case infrav1beta2.PowerVSProcessorTypeShared:
+		out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeShared))
+	case infrav1beta2.PowerVSProcessorTypeCapped:
+		out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeCapped))
+	}
+
+	return autoConvert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in, out, s)
+}

api/v1beta1/zz_generated.conversion.go

@@ -19,44 +19,25 @@ package v1beta2
 import (
 	"strconv"
 
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 func defaultIBMPowerVSMachineSpec(spec *IBMPowerVSMachineSpec) {
-	if spec.Memory == "" {
-		spec.Memory = "4"
+	if spec.MemoryGiB == 0 {
+		spec.MemoryGiB = 2
 	}
-	if spec.Processors == "" {
-		spec.Processors = "0.25"
+	if spec.Processors.StrVal == "" && spec.Processors.IntVal == 0 {
+		spec.Processors = intstr.FromString("0.25")
 	}
-	if spec.SysType == "" {
-		spec.SysType = "s922"
+	if spec.SystemType == "" {
+		spec.SystemType = "s922"
 	}
-	if spec.ProcType == "" {
-		spec.ProcType = "shared"
+	if spec.ProcessorType == "" {
+		spec.ProcessorType = PowerVSProcessorTypeShared
 	}
 }
 
-func validateIBMPowerVSSysType(spec IBMPowerVSMachineSpec) (bool, IBMPowerVSMachineSpec) {
-	sysTypes := [...]string{"s922", "e980"}
-	for _, st := range sysTypes {
-		if spec.SysType == st {
-			return true, IBMPowerVSMachineSpec{}
-		}
-	}
-	return false, spec
-}
-
-func validateIBMPowerVSProcType(spec IBMPowerVSMachineSpec) (bool, IBMPowerVSMachineSpec) {
-	procTypes := [...]string{"shared", "dedicated", "capped"}
-	for _, pt := range procTypes {
-		if spec.ProcType == pt {
-			return true, IBMPowerVSMachineSpec{}
-		}
-	}
-	return false, spec
-}
-
 func validateIBMPowerVSResourceReference(res IBMPowerVSResourceReference, resType string) (bool, *field.Error) {
 	if res.ID != nil && res.Name != nil {
 		return false, field.Invalid(field.NewPath("spec", resType), res, "Only one of "+resType+" - ID or Name may be specified")
@@ -71,17 +52,25 @@ func validateIBMPowerVSNetworkReference(res IBMPowerVSResourceReference) (bool,
 	return true, nil
 }
 
-func validateIBMPowerVSMemoryValues(resValue string) bool {
-	if val, err := strconv.ParseUint(resValue, 10, 64); err != nil || val < 2 {
+func validateIBMPowerVSMemoryValues(resValue int32) bool {
+	if val := float64(resValue); val < 2 {
 		return false
 	}
 	return true
 }
 
-func validateIBMPowerVSProcessorValues(resValue string) bool {
-	if val, err := strconv.ParseFloat(resValue, 64); err != nil || val < 0.25 {
-		return false
+func validateIBMPowerVSProcessorValues(resValue intstr.IntOrString) bool {
+	switch resValue.Type {
+	case intstr.Int:
+		if val := float64(resValue.IntVal); val < 0.25 {
+			return false
+		}
+	case intstr.String:
+		if val, err := strconv.ParseFloat(resValue.StrVal, 64); err != nil || val < 0.25 {
+			return false
+		}
 	}
+
 	return true
 }