providers/redfish: Detect duplicate update requests

bmc-toolbox · Sep 13, 2023 · 2e973ca · 2e973ca
1 parent 0fe4a15
commit 2e973ca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/providers/redfish/firmware.go b/providers/redfish/firmware.go
@@ -69,26 +69,25 @@ func (c *Conn) FirmwareInstall(ctx context.Context, component, applyAt string, f
 		return "", errors.Wrap(errInsufficientCtxTimeout, " "+time.Until(ctxDeadline).String())
 	}
 
-	// TODO; uncomment once obmc support is implemented for tasks
 	// list redfish firmware install task if theres one present
-	//	task, err := c.GetFirmwareInstallTaskQueued(ctx, component)
-	//	if err != nil {
-	//		return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, err.Error())
-	//	}
-	//
-	//	if task != nil {
-	//		msg := fmt.Sprintf("task for %s firmware install present: %s", component, task.ID)
-	//		c.Log.V(2).Info("warn", msg)
-	//	
-	//		if forceInstall {
-	//			err = c.purgeQueuedFirmwareInstallTask(ctx, component)
-	//			if err != nil {
-	//				return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, err.Error())
-	//			}
-	//		} else {
-	//			return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, msg)
-	//		}
-	//	}
+	task, err := c.GetFirmwareInstallTaskQueued(ctx, component)
+	if err != nil {
+		return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, err.Error())
+	}
+
+	if task != nil {
+		msg := fmt.Sprintf("task for %s firmware install present: %s", component, task.ID)
+		c.Log.V(2).Info("warn", msg)
+
+		if forceInstall {
+			err = c.purgeQueuedFirmwareInstallTask(ctx, component)
+			if err != nil {
+				return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, err.Error())
+			}
+		} else {
+			return "", errors.Wrap(bmclibErrs.ErrFirmwareInstall, msg)
+		}
+	}
 
 	// override the gofish HTTP client timeout,
 	// since the context timeout is set at Open() and is at a lower value than required for this operation.

diff --git a/providers/redfish/tasks.go b/providers/redfish/tasks.go
@@ -20,6 +20,7 @@ func (c *Conn) activeTask(ctx context.Context) (*gofishrf.Task, error) {
 		return nil, err
 	}
 
+	// TODO: correctly get an update task if there is one, using redfish API
 	for _, t := range tasks {
 		fmt.Println(t.TaskState)
 		fmt.Println(t.TaskStatus)
@@ -43,7 +44,7 @@ func (c *Conn) GetFirmwareInstallTaskQueued(ctx context.Context, component strin
 	case strings.Contains(vendor, constants.Dell):
 		task, err = c.getDellFirmwareInstallTaskScheduled(component)
 	default:
-		//task, err = c.redfishwrapper.Tasks(ctx)
+		task, err = c.activeTask(ctx)
 	}
 
 	if err != nil {