From cc6756522c72e4e45c2d8a22e9e4873f6d3e5ad5 Mon Sep 17 00:00:00 2001
From: grasci <86058054+grasci-arm@users.noreply.github.com>
Date: Wed, 15 May 2024 13:09:20 +0100
Subject: [PATCH] [RteModel] Improve support for csolution pdsc element

---
 libs/rtemodel/include/RteModel.h              | 22 ++++-------------
 libs/rtemodel/include/RtePackage.h            | 24 -------------------
 libs/rtemodel/src/RteModel.cpp                | 20 ++++++----------
 .../RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc    |  9 +++++++
 .../0.2.0/Templates/board1.csolution.yml      |  6 +++++
 .../0.2.0/Templates/board2.csolution.yml      |  6 +++++
 .../0.2.0/Templates/board3.csolution.yml      |  6 +++++
 7 files changed, 39 insertions(+), 54 deletions(-)
 create mode 100644 test/packs/ARM/RteTest_DFP/0.2.0/Templates/board1.csolution.yml
 create mode 100644 test/packs/ARM/RteTest_DFP/0.2.0/Templates/board2.csolution.yml
 create mode 100644 test/packs/ARM/RteTest_DFP/0.2.0/Templates/board3.csolution.yml

diff --git a/libs/rtemodel/include/RteModel.h b/libs/rtemodel/include/RteModel.h
index ae4d14f7e..f6fca0c2e 100644
--- a/libs/rtemodel/include/RteModel.h
+++ b/libs/rtemodel/include/RteModel.h
@@ -530,26 +530,16 @@ class RteModel : public RteItem
   */
   void InsertPack(RtePackage* package);
 
-  /**
-  * @brief get collection of filtered <cimage> elements collected from the packs
-  * @return list of pointers RteItem representing cimage elements
-  */
-  const Collection<RteItem*>& GetImageDescriptors() const { return m_imageDescriptors; }
   /**
   * @brief get collection of filtered <clayer> elements collected from the packs
   * @return list of pointers RteItem representing clayer elements
   */
   const Collection<RteItem*>& GetLayerDescriptors() const { return  m_layerDescriptors; }
   /**
-  * @brief get collection of filtered <cproject> elements collected from the packs
-  * @return list of pointers RteItem representing cproject elements
-  */
-  const Collection<RteItem*>& GetProjectDescriptors() const { return  m_projectDescriptors; }
-  /**
-  * @brief get collection of filtered <csolution> elements collected from the packs
-  * @return list of pointers RteItem representing csolution elements
+  * @brief get collection of filtered <template> elements collected from the packs
+  * @return list of pointers RteItem representing template elements
   */
-  const Collection<RteItem*>& GetSolutionDescriptors() const { return  m_solutionDescriptors; }
+  const Collection<RteItem*>& GetProjectDescriptors() const { return  m_templateDescriptors; }
 
 protected:
 
@@ -561,7 +551,7 @@ class RteModel : public RteItem
   virtual void FillDeviceTree();
   virtual void FillDeviceTree(RtePackage* pack);
 
-  void AddPackItemsToList(const Collection<RteItem*>& srcCollection, Collection<RteItem*>& dstCollection);
+  void AddPackItemsToList(const Collection<RteItem*>& srcCollection, Collection<RteItem*>& dstCollection, const std::string& tag);
 
   bool IsApiDominatingOrNewer(RteApi* a);
 
@@ -592,10 +582,8 @@ class RteModel : public RteItem
   RtePackageFilter m_packageFilter;
 
   // csolution-related collections
-  Collection<RteItem*> m_imageDescriptors;
   Collection<RteItem*> m_layerDescriptors;
-  Collection<RteItem*> m_projectDescriptors;
-  Collection<RteItem*> m_solutionDescriptors;
+  Collection<RteItem*> m_templateDescriptors;
 
   RteConditionContext* m_filterContext; // constructed, updated and deleted by target
 
diff --git a/libs/rtemodel/include/RtePackage.h b/libs/rtemodel/include/RtePackage.h
index 5cb551f17..85e1c07d1 100644
--- a/libs/rtemodel/include/RtePackage.h
+++ b/libs/rtemodel/include/RtePackage.h
@@ -307,30 +307,6 @@ class RtePackage : public RteRootItem
   */
   RteItem* GetBoards() const { return m_boards; }
 
-  /**
-  * @brief get collection of <cimage> elements
-  * @return list of pointers RteItem representing cimage elements
-  */
-  const Collection<RteItem*>& GetImageDescriptors() const { return GetGrandChildren("cimage"); }
-
-  /**
-  * @brief get collection of <clayer> elements
-  * @return list of pointers RteItem representing clayer elements
-  */
-  const Collection<RteItem*>& GetLayerDescriptors() const { return GetGrandChildren("csolution"); }
-
-  /**
-  * @brief get collection of <cproject> elements
-  * @return list of pointers RteItem representing cproject elements
-  */
-  const Collection<RteItem*>& GetProjectDescriptors() const { return GetGrandChildren("cprojects"); }
-
-  /**
-   * @brief get collection of <csolution> elements
-   * @return list of pointers RteItem representing csolution elements
-  */
-  const Collection<RteItem*>& GetSolutionDescriptors() const { return GetGrandChildren("csolutions"); }
-
   /**
   * @brief get <generators> element
   * @return pointer to RteGeneratorContainer representing container for generators
diff --git a/libs/rtemodel/src/RteModel.cpp b/libs/rtemodel/src/RteModel.cpp
index 61ed83240..a4291ef2c 100644
--- a/libs/rtemodel/src/RteModel.cpp
+++ b/libs/rtemodel/src/RteModel.cpp
@@ -71,10 +71,8 @@ void RteModel::ClearModel()
   m_taxonomy.clear();
   m_bundles.clear();
 
-  m_imageDescriptors.clear();
   m_layerDescriptors.clear();
-  m_projectDescriptors.clear();
-  m_solutionDescriptors.clear();
+  m_templateDescriptors.clear();
 
   m_packageDuplicates.clear();
   m_packages.clear();
@@ -500,23 +498,19 @@ void RteModel::AddItemsFromPack(RtePackage* pack)
       }
     }
   }
-  // images
-  AddPackItemsToList(pack->GetImageDescriptors(), m_imageDescriptors);
-  // layers
-  AddPackItemsToList(pack->GetLayerDescriptors(), m_layerDescriptors);
-  // projects
-  AddPackItemsToList(pack->GetProjectDescriptors(), m_projectDescriptors);
-  // projects
-  AddPackItemsToList(pack->GetSolutionDescriptors(), m_solutionDescriptors);
+  // collect layers and templates
+  auto& csolutionChildren = pack->GetGrandChildren("csolution");
+  AddPackItemsToList(csolutionChildren, m_layerDescriptors, "clayer");
+  AddPackItemsToList(csolutionChildren, m_templateDescriptors, "template");
 
   // fill api and component list
   pack->InsertInModel(this);
 }
 
-void RteModel::AddPackItemsToList(const Collection<RteItem*>& srcCollection, Collection<RteItem*>& dstCollection)
+void RteModel::AddPackItemsToList(const Collection<RteItem*>& srcCollection, Collection<RteItem*>& dstCollection, const std::string& tag)
 {
   for (auto item : srcCollection) {
-    if (IsFiltered(item)) {
+    if ((tag.empty() || tag == item->GetTag()) && IsFiltered(item)) {
       dstCollection.push_back(item);
     }
   }
diff --git a/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc b/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
index 151ef2e86..1790ce634 100644
--- a/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
+++ b/test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc
@@ -509,6 +509,15 @@
     <clayer name="Board3" type="Board" file="Layers/board3.clayer.yml" condition="BoardTest3">
       <description>"Test board layer three"</description>
     </clayer>
+    <template name="Board1Template" file="Templates/board1.csolution.yml" condition="BoardTest1">
+      <description>"Test board Template one"</description>
+    </template>
+    <template name="Board2" type="Board" file="Templates/board2.csolution.yml" condition="BoardTest2">
+      <description>"Test board Template two"</description>
+    </template>
+    <template name="Board3" type="Board" file="Templates/board3.csolution.yml" condition="BoardTest3">
+      <description>"Test board Template three"</description>
+    </template>
     <clayer name="TestVariant" type="TestVariant" file="Layers/testvariant.clayer.yml">
       <description>"Test compatible layer"</description>
     </clayer>
diff --git a/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board1.csolution.yml b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board1.csolution.yml
new file mode 100644
index 000000000..aabaec362
--- /dev/null
+++ b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board1.csolution.yml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/csolution.schema.json
+
+solution:
+
+# TODO: specify correct csolution content
+ 
diff --git a/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board2.csolution.yml b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board2.csolution.yml
new file mode 100644
index 000000000..aabaec362
--- /dev/null
+++ b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board2.csolution.yml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/csolution.schema.json
+
+solution:
+
+# TODO: specify correct csolution content
+ 
diff --git a/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board3.csolution.yml b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board3.csolution.yml
new file mode 100644
index 000000000..aabaec362
--- /dev/null
+++ b/test/packs/ARM/RteTest_DFP/0.2.0/Templates/board3.csolution.yml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/main/tools/projmgr/schemas/csolution.schema.json
+
+solution:
+
+# TODO: specify correct csolution content
+