Make sure the System helper method is used:

Many of the existing redfish feature methods weren't using the System helper that filtered for system name. Also, for virtual media ejecting, handle BMC's that don't support the "inserted" property. Signed-off-by: Jacob Weinstock <[email protected]>
bmc-toolbox · Oct 25, 2024 · 53911d9 · 53911d9
1 parent 26229cf
commit 53911d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 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/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) {