Use Redfish Http cache library to query Redfish service.
Signed-off-by: Nickle Wang <nick...@nvidia.com>
Cc: Abner Chang <abner.ch...@amd.com>
Cc: Igor Kulchytskyy <ig...@ami.com>
Cc: Nick Ramirez <nrami...@nvidia.com>
---
.../Features/Memory/V1_7_1/Dxe/MemoryDxe.inf | 3 +-
.../Features/Memory/V1_7_1/Dxe/MemoryDxe.c | 70 +++++++++++++++----
2 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.inf
b/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.inf
index 594a8749..43039b9f 100644
--- a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.inf
+++ b/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.inf
@@ -1,6 +1,7 @@
## @file
#
# (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP<BR>
+# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -36,7 +37,7 @@
RedfishResourceIdentifyLib
UefiLib
UefiDriverEntryPoint
-
+ RedfishHttpCacheLib
[Protocols]
gEdkIIRedfishConfigHandlerProtocolGuid ## PRODUCED
diff --git a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c
b/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c
index 80bfd6d2..450170e1 100644
--- a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c
+++ b/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c
@@ -2,7 +2,7 @@
Redfish feature driver implementation - Memory
(C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP<BR>
- Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights
reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -49,7 +49,8 @@ RedfishResourceProvisioningResource (
return EFI_NOT_READY;
}
- Status = GetResourceByUri (Private->RedfishService, Uri, &Response);
+ ZeroMem (&Response, sizeof (Response));
+ Status = RedfishHttpGetResource (Private->RedfishService, Uri, &Response,
TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, get resource from: %s failed\n", __func__, Uri));
return Status;
@@ -71,6 +72,7 @@ RedfishResourceProvisioningResource (
Response.Headers,
Response.Payload
);
+ RedfishHttpResetResource (Uri);
Private->Payload = NULL;
}
@@ -97,6 +99,9 @@ RedfishResourceConsumeResource (
REDFISH_RESOURCE_COMMON_PRIVATE *Private;
EFI_STATUS Status;
REDFISH_RESPONSE Response;
+ EFI_STRING PendingSettingUri;
+ REDFISH_RESPONSE PendingSettingResponse;
+ REDFISH_RESPONSE *ExpectedResponse;
CHAR8 *Etag;
if ((This == NULL) || IS_EMPTY_STRING (Uri)) {
@@ -109,14 +114,33 @@ RedfishResourceConsumeResource (
return EFI_NOT_READY;
}
- Status = GetResourceByUri (Private->RedfishService, Uri, &Response);
+ ZeroMem (&Response, sizeof (Response));
+ Status = RedfishHttpGetResource (Private->RedfishService, Uri, &Response,
TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, get resource from: %s failed\n", __func__, Uri));
return Status;
}
- Private->Uri = Uri;
- Private->Payload = Response.Payload;
+ //
+ // Check and see if "@Redfish.Settings" exist or not.
+ //
+ ZeroMem (&PendingSettingResponse, sizeof (REDFISH_RESPONSE));
+ Status = GetPendingSettings (
+ Private->RedfishService,
+ Response.Payload,
+ &PendingSettingResponse,
+ &PendingSettingUri
+ );
+ if (!EFI_ERROR (Status)) {
+ DEBUG ((REDFISH_DEBUG_TRACE, "%a: @Redfish.Settings found: %s\n",
__func__, PendingSettingUri));
+ Private->Uri = PendingSettingUri;
+ ExpectedResponse = &PendingSettingResponse;
+ } else {
+ Private->Uri = Uri;
+ ExpectedResponse = &Response;
+ }
+
+ Private->Payload = ExpectedResponse->Payload;
ASSERT (Private->Payload != NULL);
Private->Json = JsonDumpString (RedfishJsonInPayload (Private->Payload),
EDKII_JSON_COMPACT);
@@ -126,7 +150,7 @@ RedfishResourceConsumeResource (
// Find etag in HTTP response header
//
Etag = NULL;
- Status = GetEtagAndLocation (&Response, &Etag, NULL);
+ Status = GetEtagAndLocation (ExpectedResponse, &Etag, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to get ETag from HTTP header\n",
__func__));
}
@@ -149,12 +173,24 @@ RedfishResourceConsumeResource (
// Release resource
//
if (Private->Payload != NULL) {
- RedfishFreeResponse (
- Response.StatusCode,
- Response.HeaderCount,
- Response.Headers,
- Response.Payload
- );
+ if (Response.Payload != NULL) {
+ RedfishFreeResponse (
+ Response.StatusCode,
+ Response.HeaderCount,
+ Response.Headers,
+ Response.Payload
+ );
+ }
+
+ if (PendingSettingResponse.Payload != NULL) {
+ RedfishFreeResponse (
+ PendingSettingResponse.StatusCode,
+ PendingSettingResponse.HeaderCount,
+ PendingSettingResponse.Headers,
+ PendingSettingResponse.Payload
+ );
+ }
+
Private->Payload = NULL;
}
@@ -233,7 +269,8 @@ RedfishResourceUpdate (
return EFI_NOT_READY;
}
- Status = GetResourceByUri (Private->RedfishService, Uri, &Response);
+ ZeroMem (&Response, sizeof (Response));
+ Status = RedfishHttpGetResource (Private->RedfishService, Uri, &Response,
TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, get resource from: %s failed\n", __func__, Uri));
return Status;
@@ -261,6 +298,7 @@ RedfishResourceUpdate (
Response.Headers,
Response.Payload
);
+ RedfishHttpResetResource (Uri);
Private->Payload = NULL;
}
@@ -303,7 +341,8 @@ RedfishResourceCheck (
return EFI_NOT_READY;
}
- Status = GetResourceByUri (Private->RedfishService, Uri, &Response);
+ ZeroMem (&Response, sizeof (Response));
+ Status = RedfishHttpGetResource (Private->RedfishService, Uri, &Response,
TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, get resource from: %s failed\n", __func__, Uri));
return Status;
@@ -374,7 +413,8 @@ RedfishResourceIdentify (
return EFI_NOT_READY;
}
- Status = GetResourceByUri (Private->RedfishService, Uri, &Response);
+ ZeroMem (&Response, sizeof (Response));
+ Status = RedfishHttpGetResource (Private->RedfishService, Uri, &Response,
TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, get resource from: %s failed\n", __func__, Uri));
return Status;
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113077): https://edk2.groups.io/g/devel/message/113077
Mute This Topic: https://groups.io/mt/103500383/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
