Only suggest components from the same bundle (#1283) (#2172)

grasci-arm · edriouk · web-flow · commit 1c775a0eae52 · 2025-08-01T10:24:01.000+02:00
#2127 Co-authored-by: Evgueni Driouk <edriouk@arm.com>
diff --git a/libs/rtemodel/include/RteComponent.h b/libs/rtemodel/include/RteComponent.h
@@ -1014,9 +1014,11 @@ class RteComponentGroup : public RteComponentContainer
    * @brief find recursively component aggregates matching supplied attributes
    * @param componentAttributes component attributes as a reference to XmlItem
    * @param components std::set collection of RteComponentAggregate pointer to fill
+   * @param bundleName bundle to be used
    * @return overall matching result as RteItem::ConditionResult value
   */
-  virtual ConditionResult GetComponentAggregates(const XmlItem& componentAttributes, std::set<RteComponentAggregate*>& components) const;
+   virtual ConditionResult GetComponentAggregates(const XmlItem& componentAttributes, std::set<RteComponentAggregate*>& components,
+     const std::string& bundleName = EMPTY_STRING) const;
 
   /**
    * @brief adjust component selection in the group when active bundle changes
@@ -1168,7 +1170,8 @@ class RteComponentClassContainer : public RteComponentGroup
    * @param components std::set collection of RteComponentAggregate pointer to fill
    * @return overall matching result as RteItem::ConditionResult value
   */
-   ConditionResult GetComponentAggregates(const XmlItem& componentAttributes, std::set<RteComponentAggregate*>& components) const override;
+   ConditionResult GetComponentAggregates(const XmlItem& componentAttributes, std::set<RteComponentAggregate*>& components,
+     const std::string& bundleName = EMPTY_STRING) const override;
 
   /**
    * @brief find component aggregate matching supplied instance to resolve a component
diff --git a/libs/rtemodel/src/RteComponent.cpp b/libs/rtemodel/src/RteComponent.cpp
@@ -441,7 +441,7 @@ void RteComponentAggregate::Clear()
 
 bool RteComponentAggregate::IsFiltered() const
 {
-  if (GetSelectedBundleShortID() != GetBundleShortID())
+  if (GetSelectedBundleName() != GetCbundleName())
     return false;
   return true;
 }
@@ -1701,13 +1701,21 @@ string RteComponentGroup::GetDocFile() const
 }
 
 
-RteItem::ConditionResult RteComponentGroup::GetComponentAggregates(const XmlItem& componentAttributes, set<RteComponentAggregate*>& aggregates) const
+RteItem::ConditionResult RteComponentGroup::GetComponentAggregates(const XmlItem& componentAttributes,
+  set<RteComponentAggregate*>& aggregates, const std::string& bundleName) const
 {
   ConditionResult res = MISSING;
 
   for (auto child : m_children) {
     RteComponentAggregate* a = dynamic_cast<RteComponentAggregate*>(child);
-    if (a && a->MatchComponentAttributes(componentAttributes.GetAttributes())) {
+    if(!a) {
+      continue;
+    }
+    auto& componentBundle = a->GetCbundleName();
+    if(!(bundleName.empty() || bundleName == componentBundle)) {
+      continue; // skip non-matching bundles
+    }
+    if (a->MatchComponentAttributes(componentAttributes.GetAttributes())) {
       aggregates.insert(a);
       ConditionResult r = INSTALLED;
       if (a->IsFiltered()) {
@@ -1735,7 +1743,7 @@ RteItem::ConditionResult RteComponentGroup::GetComponentAggregates(const XmlItem
   }
   for (auto [_, g] : m_groups) {
     if (g) {
-      ConditionResult r = g->GetComponentAggregates(componentAttributes, aggregates);
+      ConditionResult r = g->GetComponentAggregates(componentAttributes, aggregates, bundleName);
       if (res < r)
         res = r;
     }
@@ -1896,11 +1904,15 @@ RteComponentGroup* RteComponentClassContainer::CreateGroup(const string& name)
   return new RteComponentClass(this);
 }
 
-RteItem::ConditionResult RteComponentClassContainer::GetComponentAggregates(const XmlItem& componentAttributes, set<RteComponentAggregate*>& aggregates) const
+RteItem::ConditionResult RteComponentClassContainer::GetComponentAggregates(const XmlItem& componentAttributes, set<RteComponentAggregate*>& aggregates,
+  const std::string& _bundleName) const
 {
   RteComponentGroup* classGroup = GetGroup(componentAttributes.GetAttribute("Cclass"));
-  if (classGroup)
-    return classGroup->GetComponentAggregates(componentAttributes, aggregates);
+  if(classGroup) {
+     // limit to selected bundle if at least one component is selected
+    const string& selectedBundleName = classGroup->IsSelected() ? classGroup->GetSelectedBundleName() : EMPTY_STRING;
+    return classGroup->GetComponentAggregates(componentAttributes, aggregates, selectedBundleName);
+  }
   return MISSING;
 }
 
diff --git a/libs/rtemodel/test/src/RteConditionTest.cpp b/libs/rtemodel/test/src/RteConditionTest.cpp
@@ -79,16 +79,40 @@ TEST_F(RteConditionTest, MissingIgnoredFulfilledSelectable) {
   RteCondition* denyIncompatibleVariant = pack->GetCondition("DenyIncompatibleVariant");
   ASSERT_NE(denyIncompatibleVariant, nullptr);
 
-  // select component to check dependencies
+  // list only selected bundle
   RteComponentInstance item(nullptr);
   item.SetTag("component");
+  item.SetAttributes({ {"Cbundle","BundleOne" },
+                       {"Cclass","RteTestBundle" },
+                       {"Cgroup", "G2" },
+                       {"Cversion","1.1.0"},
+                       {"condition","Require_G0"} });
+  item.SetPackageAttributes(packInfo);
+  RteComponent* c = rteModel->FindFirstComponent(item);
+  ASSERT_NE(c, nullptr);
+  auto requireG0Condition = pack->GetCondition("Require_G0");
+  ASSERT_NE(requireG0Condition, nullptr);
+  auto expr = dynamic_cast<RteConditionExpression*>(requireG0Condition->GetFirstChild());
+  ASSERT_NE(expr, nullptr);
+  set<RteComponentAggregate*> aggregates;
+  activeTarget->GetComponentAggregates(*expr, aggregates);
+  ASSERT_EQ(aggregates.size(), 3); // all available bundles
+  aggregates.clear();
+  activeTarget->SelectComponent(c, 1, true);
+  EXPECT_EQ(depSolver->GetConditionResult(), RteItem::SELECTABLE);
+  activeTarget->GetComponentAggregates(*expr, aggregates);
+  ASSERT_EQ(aggregates.size(), 1); // only with selected bundle
+  auto depsAggr = *aggregates.begin();
+  EXPECT_EQ(depsAggr->GetCbundleName(), "BundleOne");
+  activeTarget->SelectComponent(c, 0, true);
+
+  // select component to check dependencies
   item.SetAttributes({ {"Cclass","RteTest" },
                        {"Cgroup", "AcceptDependency" },
                        {"Cversion","0.9.9"},
                        {"condition","AcceptDependency"} });
-  item.SetPackageAttributes(packInfo);
 
-  RteComponent* c = rteModel->FindFirstComponent(item);
+  c = rteModel->FindFirstComponent(item);
   ASSERT_NE(c, nullptr);
   activeTarget->SelectComponent(c, 1, true);
   EXPECT_EQ(depSolver->GetConditionResult(), RteItem::FULFILLED); // required dependency already selected
diff --git a/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc b/test/packs/ARM/RteTest/0.1.0/ARM.RteTest.pdsc
@@ -86,7 +86,9 @@
     <condition id="DenyIncompatibleVariant">
       <deny condition="Incompatible Variant"/>
     </condition>
-
+    <condition id="Require_G0">
+      <require Cclass="RteTestBundle" Cgroup="G0"/>
+    </condition>
   </conditions>
 
   <apis>
@@ -140,7 +142,7 @@
           <file category="doc" name="https://arm-software.github.io/CMSIS_5/Pack/html/createPackUtil.html"/>
         </files>
       </component>
-      <component Cgroup="G2">
+      <component Cgroup="G2" condition="Require_G0">
         <description>Bundle One, component G2</description>
         <files>
           <file category="doc" name="https://arm-software.github.io/CMSIS_5/Pack/html/createPackUtil.html"/>
@@ -157,7 +159,7 @@
           <file category="doc" name="https://arm-software.github.io/CMSIS_5/Pack/html/pdsc_conditions_pg.html"/>
         </files>
       </component>
-      <component Cgroup="G2">
+      <component Cgroup="G2" condition="Require_G0">
         <description>Bundle Two, component G2</description>
         <files>
           <file category="doc" name="https://arm-software.github.io/CMSIS_5/Pack/html/createPackUtil.html"/>
