Because EdkIIRedfishResourceConfigLib is updated to support
Redfish resource config2 protocol, update corresponding
functions in feature drivers.
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/Bios/v1_0_9/Common/BiosCommon.c | 14 +++++++-------
.../BootOptionCollectionDxe.c | 14 +++++++-------
.../ComputerSystemCollectionDxe.c | 16 ++++++++--------
.../MemoryCollectionDxe/MemoryCollectionDxe.c | 16 ++++++++--------
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/RedfishClientPkg/Features/Bios/v1_0_9/Common/BiosCommon.c
b/RedfishClientPkg/Features/Bios/v1_0_9/Common/BiosCommon.c
index 1f3c30147..1eb269a84 100644
--- a/RedfishClientPkg/Features/Bios/v1_0_9/Common/BiosCommon.c
+++ b/RedfishClientPkg/Features/Bios/v1_0_9/Common/BiosCommon.c
@@ -782,7 +782,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a, process resource for: %s\n", __func__,
Uri));
- Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, &SchemaInfo);
+ Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, NULL, &SchemaInfo);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to get schema information from: %s %r\n",
__func__, Uri, Status));
return Status;
@@ -795,7 +795,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a Identify for %s\n", __func__, Uri));
ConfigLang = RedfishGetConfigLanguage (Uri);
if (ConfigLang == NULL) {
- Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri,
Private->InformationExchange);
+ Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri, NULL,
Private->InformationExchange);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((DEBUG_MANAGEABILITY, "%a, \"%s\" is not handled by us\n",
__func__, Uri));
@@ -811,17 +811,17 @@ HandleResource (
}
//
- // Check and see if target property exist or not even when collection
memeber exists.
+ // Check and see if target property exist or not even when collection member
exists.
// If not, we sill do provision.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a Check for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
//
// The target property does not exist, do the provision to create property.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a provision for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri,
Private->InformationExchange, FALSE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri, NULL,
Private->InformationExchange, FALSE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to provision with GET mode: %r\n",
__func__, Status));
}
@@ -833,7 +833,7 @@ HandleResource (
// Consume first.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a consume for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to consume resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -842,7 +842,7 @@ HandleResource (
// Patch.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a update for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to update resource for: %s: %r\n",
__func__, Uri, Status));
}
diff --git
a/RedfishClientPkg/Features/BootOptionCollection/BootOptionCollectionDxe.c
b/RedfishClientPkg/Features/BootOptionCollection/BootOptionCollectionDxe.c
index 4f94a4495..cd1437f54 100644
--- a/RedfishClientPkg/Features/BootOptionCollection/BootOptionCollectionDxe.c
+++ b/RedfishClientPkg/Features/BootOptionCollection/BootOptionCollectionDxe.c
@@ -44,7 +44,7 @@ HandleResource (
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a: process resource
for: %s\n", __func__, Uri));
- Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, &SchemaInfo);
+ Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, NULL, &SchemaInfo);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to get schema information from: %s %r\n",
__func__, Uri, Status));
return Status;
@@ -58,7 +58,7 @@ HandleResource (
SystemRestDetected = FALSE;
ConfigLang = RedfishGetConfigLanguage (Uri);
if (ConfigLang == NULL) {
- Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri,
Private->InformationExchange);
+ Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri, NULL,
Private->InformationExchange);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a: \"%s\" is not
handled by us\n", __func__, Uri));
@@ -88,7 +88,7 @@ HandleResource (
// If not, we sill do provision.
//
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a Check for %s\n",
__func__, Uri));
- Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a: \"%s\" is not
handled by us\n", __func__, Uri));
@@ -99,7 +99,7 @@ HandleResource (
// The target property does not exist, do the provision to create property.
//
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a provision for
%s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri,
Private->InformationExchange, FALSE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri, NULL,
Private->InformationExchange, FALSE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to provision with GET mode: %r\n",
__func__, Status));
}
@@ -114,7 +114,7 @@ HandleResource (
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a system has been
reset to default setting. ignore pending settings because they may be stale
values\n", __func__));
} else {
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a consume for %s\n",
__func__, Uri));
- Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to consume resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -124,7 +124,7 @@ HandleResource (
// Patch.
//
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a update for %s\n",
__func__, Uri));
- Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to update resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -262,7 +262,7 @@ CreateCollectionResource (
DEBUG ((REDFISH_BOOT_OPTION_COLLECTION_DEBUG_TRACE, "%a: supported schema:
%a %a.%a.%a\n", __func__, SchemaInfo.Schema, SchemaInfo.Major,
SchemaInfo.Minor, SchemaInfo.Errata));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, BootOptionUri,
Private->InformationExchange, TRUE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, BootOptionUri,
NULL, Private->InformationExchange, TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to create resource for: %s: %r\n",
__func__, BootOptionUri, Status));
}
diff --git
a/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
b/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
index 975ba0564..55a6d07db 100644
---
a/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
+++
b/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
@@ -35,7 +35,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a: process resource for: %s\n", __func__,
Uri));
- Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, &SchemaInfo);
+ Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, NULL, &SchemaInfo);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to get schema information from: %s %r\n",
__func__, Uri, Status));
return Status;
@@ -48,7 +48,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a Identify for %s\n", __func__, Uri));
ConfigLang = RedfishGetConfigLanguage (Uri);
if (ConfigLang == NULL) {
- Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri,
Private->InformationExchange);
+ Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri, NULL,
Private->InformationExchange);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((DEBUG_MANAGEABILITY, "%a: \"%s\" is not handled by us\n",
__func__, Uri));
@@ -90,11 +90,11 @@ HandleResource (
}
//
- // Check and see if target property exist or not even when collection
memeber exists.
+ // Check and see if target property exist or not even when collection member
exists.
// If not, we sill do provision.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a Check for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((REDFISH_DEBUG_TRACE, "%a: \"%s\" is not handled by us\n",
__func__, Uri));
@@ -105,7 +105,7 @@ HandleResource (
// The target property does not exist, do the provision to create property.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a provision for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri,
Private->InformationExchange, FALSE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri, NULL,
Private->InformationExchange, FALSE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to provision with PATCH mode: %r\n",
__func__, Status));
}
@@ -117,7 +117,7 @@ HandleResource (
// Consume first.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a consume for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to consume resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -126,7 +126,7 @@ HandleResource (
// Patch.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a update for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to update resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -236,7 +236,7 @@ CreateCollectionResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a: supported schema: %a %a.%a.%a\n",
__func__, SchemaInfo.Schema, SchemaInfo.Major, SchemaInfo.Minor,
SchemaInfo.Errata));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo,
Private->CollectionUri, Private->InformationExchange, TRUE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo,
Private->CollectionUri, NULL, Private->InformationExchange, TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a: failed to create resource for: %s: %r\n",
__func__, Private->CollectionUri, Status));
}
diff --git
a/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
b/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
index 1b7d74e86..d963fb52a 100644
--- a/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
+++ b/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
@@ -35,7 +35,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a, process resource for: %s\n", __func__,
Uri));
- Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, &SchemaInfo);
+ Status = GetRedfishSchemaInfo (Private->RedfishService,
Private->JsonStructProtocol, Uri, NULL, &SchemaInfo);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to get schema information from: %s %r\n",
__func__, Uri, Status));
return Status;
@@ -48,7 +48,7 @@ HandleResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a Identify for %s\n", __func__, Uri));
ConfigLang = RedfishGetConfigLanguage (Uri);
if (ConfigLang == NULL) {
- Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri,
Private->InformationExchange);
+ Status = EdkIIRedfishResourceConfigIdentify (&SchemaInfo, Uri, NULL,
Private->InformationExchange);
if (EFI_ERROR (Status)) {
if (Status == EFI_UNSUPPORTED) {
DEBUG ((DEBUG_MANAGEABILITY, "%a, \"%s\" is not handled by us\n",
__func__, Uri));
@@ -86,17 +86,17 @@ HandleResource (
}
//
- // Check and see if target property exist or not even when collection
memeber exists.
+ // Check and see if target property exist or not even when collection member
exists.
// If not, we sill do provision.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a Check for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigCheck (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
//
// The target property does not exist, do the provision to create property.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a provision for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri,
Private->InformationExchange, FALSE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo, Uri, NULL,
Private->InformationExchange, FALSE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to provision with GET mode: %r\n",
__func__, Status));
}
@@ -108,7 +108,7 @@ HandleResource (
// Consume first.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a consume for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigConsume (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to consume resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -117,7 +117,7 @@ HandleResource (
// Patch.
//
DEBUG ((REDFISH_DEBUG_TRACE, "%a update for %s\n", __func__, Uri));
- Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri);
+ Status = EdkIIRedfishResourceConfigUpdate (&SchemaInfo, Uri, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to update resource for: %s: %r\n",
__func__, Uri, Status));
}
@@ -227,7 +227,7 @@ CreateCollectionResource (
DEBUG ((REDFISH_DEBUG_TRACE, "%a, supported schema: %a %a.%a.%a\n",
__func__, SchemaInfo.Schema, SchemaInfo.Major, SchemaInfo.Minor,
SchemaInfo.Errata));
- Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo,
Private->CollectionUri, Private->InformationExchange, TRUE);
+ Status = EdkIIRedfishResourceConfigProvisioning (&SchemaInfo,
Private->CollectionUri, NULL, Private->InformationExchange, TRUE);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a, failed to create resource for: %s: %r\n",
__func__, Private->CollectionUri, Status));
}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116317): https://edk2.groups.io/g/devel/message/116317
Mute This Topic: https://groups.io/mt/104721516/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
