Skip to content

RDE additional resources fixes #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kostr wants to merge 3 commits into
base: integ_sp7
Choose a base branch
from
Open

RDE additional resources fixes #80

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbd2228
rde: Fix parent resourceId for AdditionalResourceSubURIs
Kostr Jun 29, 2026
480c177
rde: Add all the additional resources to resInfoMap
Kostr Jun 29, 2026
e600cb8
rde: Drop workaround for duplicate URI segments
Kostr Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 12 additions & 44 deletions rde/resource_registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,41 +238,7 @@ std::string ResourceRegistry::constructFullUriRecursive(
if (!parentUri.empty() && parentUri.back() != '/')
parentUri += "/";

// TODO: Workaround for RDE PDRs that redundantly encode segments like
// "0/0/Settings" If parent URI ends with the same segment as the beginning
// of `part`, skip duplication
std::vector<std::string> parentSegments;
std::stringstream ss(parentUri);
std::string segment;
while (std::getline(ss, segment, '/'))
{
if (!segment.empty())
parentSegments.push_back(segment);
}

std::vector<std::string> partSegments;
std::stringstream ps(part);
while (std::getline(ps, segment, '/'))
{
if (!segment.empty())
partSegments.push_back(segment);
}

if (!parentSegments.empty() && !partSegments.empty() &&
parentSegments.back() == partSegments.front())
{
// Skip the first segment of `part` to avoid duplication
partSegments.erase(partSegments.begin());
}

for (const auto& seg : partSegments)
{
parentUri += seg + "/";
}

// Remove trailing slash if added
if (!parentUri.empty() && parentUri.back() == '/')
parentUri.pop_back();
parentUri += part;

return parentUri;
}
Expand Down Expand Up @@ -312,15 +278,6 @@ std::vector<ResourceInfo> ResourceRegistry::parseRedfishResourcePDRs(
subUriMap[rid] = fullUri;
parentMap[rid] = parent;

for (size_t i = 0; i < pdr->add_resrc_id_count; ++i)
{
add_resrc_t* add = pdr->additional_resrc[i];
uint16_t addId = static_cast<uint16_t>(add->resrc_id);
std::string addUri = getRdeResourceName(add->name, add->length);
subUriMap[addId] = addUri;
parentMap[addId] = rid;
}

ResourceInfo info;
info.resourceId = std::to_string(rid);
info.schemaName = getRdeResourceName(pdr->major_schema.name,
Expand All @@ -329,6 +286,17 @@ std::vector<ResourceInfo> ResourceRegistry::parseRedfishResourcePDRs(
info.schemaClass = PLDM_RDE_SCHEMA_MAJOR;
info.propContainResourceName = proposedRoot;
resInfoMap[rid] = info;

for (size_t i = 0; i < pdr->add_resrc_id_count; ++i)
{
add_resrc_t* add = pdr->additional_resrc[i];
uint16_t addId = static_cast<uint16_t>(add->resrc_id);
std::string addUri = getRdeResourceName(add->name, add->length);
subUriMap[addId] = addUri;
parentMap[addId] = parent;
info.resourceId = std::to_string(addId);
resInfoMap[addId] = info;
}
}

for (const auto& [rid, _] : subUriMap)
Expand Down