Add reset bmc, improve controller logic

Author: nagadeesh-nagaraja

api/v1alpha1/bmc_types.go

@@ -23,6 +23,10 @@ const (
 // BMCSpec defines the desired state of BMC
 // +kubebuilder:validation:XValidation:rule="has(self.access) != has(self.endpointRef)",message="exactly one of access or endpointRef needs to be set"
 type BMCSpec struct {
+
+	//UUID is the unique identifier for the BMC as defined in REDFISH API.
+	UUID string `json:"uuid,omitempty"`
+
 	// EndpointRef is a reference to the Kubernetes object that contains the endpoint information for the BMC.
 	// This reference is typically used to locate the BMC endpoint within the cluster.
 	// +optional

api/v1alpha1/bmcsettings_types.go

@@ -57,25 +57,10 @@ const (
 	BMCSettingsStateFailed BMCSettingsState = "Failed"
 )
 
-type BMCSettingUpdateState string
-
-const (
-	// SettingUpdateStateWaitOnServerReboot specifies that the BMC setting state is waiting on server to turn off during Reboot.
-	BMCSettingUpdateWaitOnServerRebootPowerOff BMCSettingUpdateState = "WaitOnServerRebootPowerOff"
-	// BMCSettingUpdateWaitOnServerRebootPowerOn specifies that the BMC setting state is waiting on server to turn on during Reboot.
-	BMCSettingUpdateWaitOnServerRebootPowerOn BMCSettingUpdateState = "WaitOnServerRebootPowerOn"
-	// SettingUpdateStateIssued specifies that the BMC new setting was posted to RedFish
-	BMCSettingUpdateStateIssue BMCSettingUpdateState = "IssueSettingUpdate"
-	// SettingUpdateStateCompleted specifies that the BMC setting has been completed.
-	BMCSettingUpdateStateVerification BMCSettingUpdateState = "VerifySettingUpdate"
-)
-
 // BMCSettingsStatus defines the observed state of BMCSettings.
 type BMCSettingsStatus struct {
 	// State represents the current state of the BMC configuration task.
 	State BMCSettingsState `json:"state,omitempty"`
-	// UpdateSettingState represents the current state of the BMC setting update task.
-	UpdateSettingState BMCSettingUpdateState `json:"updateSettingState,omitempty"`
 }
 
 // +kubebuilder:object:root=true

bmc/bmc.go

@@ -42,25 +42,32 @@ type BMC interface {
 	GetSystems(ctx context.Context) ([]Server, error)
 
 	// GetManager returns the manager
-	GetManager() (*Manager, error)
+	GetManager(UUID string) (*redfish.Manager, error)
+
+	// Reset performs a reset on the Manager.
+	ResetManager(ctx context.Context, UUID string, resetType redfish.ResetType) error
 
 	GetBootOrder(ctx context.Context, systemUUID string) ([]string, error)
 
 	GetBiosAttributeValues(ctx context.Context, systemUUID string, attributes []string) (redfish.SettingsAttributes, error)
 
-	GetBMCAttributeValues(ctx context.Context, attributes []string) (redfish.SettingsAttributes, error)
+	//(ctx context.Context, systemUUID string) (redfish.SettingsAttributes, error)
+
+	GetBMCAttributeValues(ctx context.Context, UUID string, attributes []string) (redfish.SettingsAttributes, error)
+
+	GetBMCPendingAttributeValues(ctx context.Context, UUID string) (redfish.SettingsAttributes, error)
 
 	CheckBiosAttributes(attrs map[string]string) (reset bool, err error)
 
 	CheckBMCAttributes(attrs redfish.SettingsAttributes) (reset bool, err error)
 
 	SetBiosAttributesOnReset(ctx context.Context, systemUUID string, attributes map[string]string) (err error)
 
-	SetBMCAttributesImediately(ctx context.Context, attributes redfish.SettingsAttributes) (err error)
+	SetBMCAttributesImediately(ctx context.Context, UUID string, attributes redfish.SettingsAttributes) (err error)
 
 	GetBiosVersion(ctx context.Context, systemUUID string) (string, error)
 
-	GetBMCVersion(ctx context.Context) (string, error)
+	GetBMCVersion(ctx context.Context, UUID string) (string, error)
 
 	SetBootOrder(ctx context.Context, systemUUID string, order []string) error