Update redfish system name matching (#401)

bmc-toolbox · Oct 28, 2024 · 490323d · 490323d
2 parents 8a5f5a1 + 53911d9
commit 490323d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/internal/redfishwrapper/boot_device.go b/internal/redfishwrapper/boot_device.go
@@ -89,7 +89,7 @@ func (c *Client) SystemBootDeviceSet(_ context.Context, bootDevice string, setPe
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	systems, err := c.client.Service.Systems()
+	systems, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -136,7 +136,7 @@ func (c *Client) GetBootDeviceOverride(_ context.Context) (override bmc.BootDevi
 		return override, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	systems, err := c.client.Service.Systems()
+	systems, err := c.Systems()
 	if err != nil {
 		return override, err
 	}

diff --git a/internal/redfishwrapper/power.go b/internal/redfishwrapper/power.go
@@ -36,7 +36,7 @@ func (c *Client) BMCReset(ctx context.Context, resetType string) (ok bool, err e
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	managers, err := c.client.Service.Managers()
+	managers, err := c.Managers(ctx)
 	if err != nil {
 		return false, err
 	}
@@ -57,8 +57,7 @@ func (c *Client) SystemPowerOn(ctx context.Context) (ok bool, err error) {
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -84,8 +83,7 @@ func (c *Client) SystemPowerOff(ctx context.Context) (ok bool, err error) {
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -112,8 +110,7 @@ func (c *Client) SystemReset(ctx context.Context) (ok bool, err error) {
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -147,8 +144,7 @@ func (c *Client) SystemPowerCycle(ctx context.Context) (ok bool, err error) {
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -180,8 +176,7 @@ func (c *Client) SystemPowerStatus(ctx context.Context) (result string, err erro
 		return result, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return "", err
 	}
@@ -199,8 +194,7 @@ func (c *Client) SystemForceOff(ctx context.Context) (ok bool, err error) {
 		return false, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	service := c.client.Service
-	ss, err := service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return false, err
 	}
@@ -227,7 +221,7 @@ func (c *Client) SendNMI(_ context.Context) error {
 		return errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	ss, err := c.client.Service.Systems()
+	ss, err := c.Systems()
 	if err != nil {
 		return err
 	}

diff --git a/internal/redfishwrapper/system.go b/internal/redfishwrapper/system.go
@@ -49,7 +49,24 @@ func (c *Client) Managers(ctx context.Context) ([]*redfish.Manager, error) {
 		return nil, errors.Wrap(bmclibErrs.ErrNotAuthenticated, err.Error())
 	}
 
-	return c.client.Service.Managers()
+	ms, err := c.client.Service.Managers()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, m := range ms {
+		sys, err := m.ManagerForServers()
+		if err != nil {
+			continue
+		}
+		for _, s := range sys {
+			if s.Name == c.systemName {
+				return []*redfish.Manager{m}, nil
+			}
+		}
+	}
+
+	return ms, nil
 }
 
 // Chassis gets the chassis instances managed by this service.

diff --git a/internal/redfishwrapper/virtual_media.go b/internal/redfishwrapper/virtual_media.go
@@ -43,13 +43,21 @@ func (c *Client) SetVirtualMedia(ctx context.Context, kind string, mediaURL stri
 		}
 
 		for _, vm := range virtualMedia {
+			var ejected bool
 			if vm.Inserted {
 				if err := vm.EjectMedia(); err != nil {
 					return false, err
 				}
+				ejected = true
 			}
 			if mediaURL == "" {
 				// Only ejecting the media was requested.
+				// For BMC's that don't support the "inserted" property, we need to eject the media if it's not already ejected.
+				if !ejected {
+					if err := vm.EjectMedia(); err != nil {
+						return false, err
+					}
+				}
 				return true, nil
 			}
 			if !slices.Contains(vm.MediaTypes, mediaKind) {