redfishwrapper/firmware: lets not strip the JID_ prefix, since the me…

…thod should be generic
bmc-toolbox · Nov 28, 2023 · 63f4d53 · 63f4d53
1 parent 5622adc
commit 63f4d53
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/internal/redfishwrapper/firmware.go b/internal/redfishwrapper/firmware.go
@@ -192,11 +192,6 @@ func taskIDFromLocationHeader(uri string) (taskID string, err error) {
 	uri = strings.TrimSuffix(uri, "/")
 
 	switch {
-	// idracs return /redfish/v1/TaskService/Tasks/JID_467696020275
-	case strings.Contains(uri, "JID_"):
-		taskID = strings.Split(uri, "JID_")[1]
-		return taskID, nil
-
 	// OpenBMC returns /redfish/v1/TaskService/Tasks/12/Monitor
 	case strings.Contains(uri, "/Tasks/") && strings.HasSuffix(uri, "/Monitor"):
 		taskIDPart := strings.Split(uri, "/Tasks/")[1]

diff --git a/internal/redfishwrapper/firmware_test.go b/internal/redfishwrapper/firmware_test.go
@@ -263,7 +263,7 @@ func TestTaskIDFromLocationHeader(t *testing.T) {
 		{
 			name:        "task URI with JID",
 			uri:         "http://foo/redfish/v1/TaskService/Tasks/JID_12345",
-			expectedID:  "12345",
+			expectedID:  "JID_12345",
 			expectedErr: nil,
 		},
 		{