added enum in the api

Author: deepakm-ntnx

api/v1alpha1/nutanix_node_types.go

@@ -4,6 +4,7 @@
 package v1alpha1
 
 import (
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/variables"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
@@ -29,6 +30,10 @@ func (NutanixIdentifierType) VariableSchema() clusterv1.VariableSchema {
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 			Type:        "string",
 			Description: "NutanixIdentifierType is an enumeration of different resource identifier types",
+			Enum: variables.MustMarshalValuesToEnumJSON(
+				NutanixIdentifierName,
+				NutanixIdentifierUUID,
+			),
 		},
 	}
 }
@@ -41,6 +46,10 @@ func (NutanixBootType) VariableSchema() clusterv1.VariableSchema {
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 			Type:        "string",
 			Description: "NutanixBootType is an enumeration of different boot types.",
+			Enum: variables.MustMarshalValuesToEnumJSON(
+				NutanixBootTypeLegacy,
+				NutanixBootTypeUEFI,
+			),
 		},
 	}
 }
@@ -53,6 +62,9 @@ func (NutanixGPUIdentifierType) VariableSchema() clusterv1.VariableSchema {
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{
 			Type:        "string",
 			Description: "NutanixGPUIdentifierType is an enumeration of different resource identifier types for GPU entities.",
+			// TODO:deepakm-ntnx add GPU Identifier type enums
+			// Enum: variables.MustMarshalValuesToEnumJSON(
+			// ),
 		},
 	}
 }
@@ -169,7 +181,7 @@ func (NutanixResourceIdentifier) VariableSchema() clusterv1.VariableSchema {
 			Description: "Nutanix Resource Identifier",
 			Type:        "object",
 			Properties: map[string]clusterv1.JSONSchemaProps{
-				"type": NutanixIdentifierType("name").VariableSchema().OpenAPIV3Schema,
+				"type": NutanixIdentifierType("").VariableSchema().OpenAPIV3Schema,
 				"uuid": {
 					Type:        "string",
 					Description: "uuid is the UUID of the resource in the PC.",

pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go

@@ -139,13 +139,13 @@ func (h *nutanixMachineDetailsControlPlanePatchHandler) Mutate(
 				subnet := capxv1.NutanixResourceIdentifier{}
 				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
 					subnet.Type = capxv1.NutanixIdentifierName
-					if subnetCRE.Name == nil {
+					if subnetCRE.Name == nil || len(*subnetCRE.Name) == 0{
 						continue
 					}
 					subnet.Name = subnetCRE.Name
 				} else {
 					subnet.Type = capxv1.NutanixIdentifierUUID
-					if subnetCRE.UUID == nil {
+					if subnetCRE.UUID == nil || len(*subnetCRE.UUID) == 0{
 						continue
 					}
 					subnet.UUID = subnetCRE.UUID

pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go

@@ -128,13 +128,13 @@ func (h *nutanixMachineDetailsWorkerPatchHandler) Mutate(
 				subnet := capxv1.NutanixResourceIdentifier{}
 				if subnetCRE.Type == v1alpha1.NutanixIdentifierName {
 					subnet.Type = capxv1.NutanixIdentifierName
-					if subnetCRE.Name == nil {
+					if subnetCRE.Name == nil || len(*subnetCRE.Name) == 0 {
 						continue
 					}
 					subnet.Name = subnetCRE.Name
 				} else {
 					subnet.Type = capxv1.NutanixIdentifierUUID
-					if subnetCRE.UUID == nil {
+					if subnetCRE.UUID == nil || len(*subnetCRE.UUID) == 0 {
 						continue
 					}
 					subnet.UUID = subnetCRE.UUID