Resolve merge conflicts with main

Author: nagadeesh-nagaraja

bmc/bmc.go

@@ -25,6 +25,14 @@ const (
 	ManufacturerHPE    Manufacturer = "HPE"
 )
 
+type SettingAttributeValueTypes string
+
+const (
+	TypeInteger      SettingAttributeValueTypes = "integer"
+	TypeString       SettingAttributeValueTypes = "string"
+	TypeEnumerations SettingAttributeValueTypes = "enumeration"
+)
+
 // BMC defines an interface for interacting with a Baseboard Management Controller.
 type BMC interface {
 	// PowerOn powers on the system.
@@ -98,22 +106,6 @@ type BMC interface {
 	WaitForServerPowerState(ctx context.Context, systemUUID string, powerState redfish.PowerState) error
 }
 
-type Manufacturer string
-
-const (
-	ManufacturerDell   Manufacturer = "Dell Inc."
-	ManufacturerLenovo Manufacturer = "Lenovo"
-	ManufacturerHPE    Manufacturer = "HPE"
-)
-
-type SettingAttributeValueTypes string
-
-const (
-	TypeInteger      SettingAttributeValueTypes = "integer"
-	TypeString       SettingAttributeValueTypes = "string"
-	TypeEnumerations SettingAttributeValueTypes = "enumeration"
-)
-
 type OEMManagerInterface interface {
 	GetOEMBMCSettingAttribute(attributes []string) (redfish.SettingsAttributes, error)
 	GetBMCPendingAttributeValues() (redfish.SettingsAttributes, error)
@@ -122,6 +114,19 @@ type OEMManagerInterface interface {
 	UpdateBMCAttributesApplyAt(attrs redfish.SettingsAttributes, applyTime common.ApplyTime) error
 }
 
+type OEMInterface interface {
+	GetUpdateRequestBody(
+		parameters *redfish.SimpleUpdateParameters,
+	) *oem.SimpleUpdateRequestBody
+	GetUpdateTaskMonitorURI(
+		response *http.Response,
+	) (string, error)
+	GetTaskMonitorDetails(
+		ctx context.Context,
+		taskMonitorResponse *http.Response,
+	) (*redfish.Task, error)
+}
+
 type Entity struct {
 	// ID uniquely identifies the resource.
 	ID string `json:"Id"`
@@ -312,19 +317,6 @@ func NewOEMManager(ooem *redfish.Manager, service *gofish.Service) (OEMManagerIn
 	return OEMManager, nil
 }
 
-type OEMInterface interface {
-	GetUpdateRequestBody(
-		parameters *redfish.SimpleUpdateParameters,
-	) *oem.SimpleUpdateRequestBody
-	GetUpdateTaskMonitorURI(
-		response *http.Response,
-	) (string, error)
-	GetTaskMonitorDetails(
-		ctx context.Context,
-		taskMonitorResponse *http.Response,
-	) (*redfish.Task, error)
-}
-
 func NewOEM(manufacturer string, service *gofish.Service) (OEMInterface, error) {
 	var oemintf OEMInterface
 	switch manufacturer {

internal/controller/biosversion_controller_test.go

@@ -21,7 +21,6 @@ import (
 
 var _ = Describe("BIOSVersion Controller", func() {
 	ns := SetupTest()
-	ns.Name = "default"
 
 	var (
 		server                   *metalv1alpha1.Server