Implementation for GetVariables() RPC method

Author: edriouk

tools/projmgr/CMakeLists.txt

@@ -24,8 +24,8 @@ include(FetchContent)
 FetchContent_Declare(
   rpc-interface
   DOWNLOAD_EXTRACT_TIMESTAMP ON
-  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.6/csolution-rpc.zip
-  URL_HASH SHA256=86bce42eaef998cb37f3623931068056625d471e80032695946081531359ba5f
+  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.7/csolution-rpc.zip
+  URL_HASH SHA256=ad004d41e10862eb5b153b509a0e3edde09d0cb69595c96c908bf1f5ab1e65f8
 )
 FetchContent_MakeAvailable(rpc-interface)
 

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -86,6 +86,7 @@ class RpcHandler : public RpcMethods {
   RpcArgs::UsedItems GetUsedItems(const string& context) override;
   RpcArgs::PacksInfo GetPacksInfo(const string& context, const bool& all) override;
   RpcArgs::SuccessResult SelectPack(const string& context, const RpcArgs::PackReference& pack) override;
+  RpcArgs::VariablesResult GetVariables(const string& context) override;
   RpcArgs::DeviceList GetDeviceList(const string& context, const string& namePattern, const string& vendor) override;
   RpcArgs::DeviceInfo GetDeviceInfo(const string& id) override;
   RpcArgs::BoardList GetBoardList(const string& context, const string& namePattern, const string& vendor) override;
@@ -474,6 +475,15 @@ RpcArgs::PacksInfo RpcHandler::GetPacksInfo(const string& context, const bool& a
   return packsInfo;
 }
 
+RpcArgs::VariablesResult RpcHandler::GetVariables(const string& context) {
+  RpcArgs::VariablesResult res;
+  res.success = false;
+  auto& contextItem = GetContext(context);
+  res.variables = contextItem.variables;
+  res.success = true;
+  return res;
+}
+
 RpcArgs::DeviceList RpcHandler::GetDeviceList(const string& context, const string& namePattern, const string& vendor)
 {
   RpcArgs::DeviceList deviceList{{false}};

tools/projmgr/test/src/ProjMgrRpcTests.cpp

@@ -1145,4 +1145,35 @@ TEST_F(ProjMgrRpcTests, RpcListMissingPacks) {
   EXPECT_EQ(responses[2]["result"]["message"], "Setup of solution contexts failed");
 }
 
+TEST_F(ProjMgrRpcTests, RpcGetVariables) {
+  vector<string> contextList = {
+    "variables.BuildType1+TargetType1",
+  };
+
+  auto requests = CreateLoadRequests("/TestLayers/variables.csolution.yml", "TargetType1", contextList);
+  int id = 3;
+  for(const auto& context : contextList) {
+    requests += FormatRequest(id++, "GetVariables", json({{ "context", context }}));
+  }
+
+  const auto& responses = RunRpcMethods(requests);
+
+  EXPECT_TRUE(responses[2]["result"]["success"]);
+  map<string, string> vars = responses[2]["result"]["variables"];
+
+  EXPECT_EQ(vars["BuildType"], "BuildType1");
+  EXPECT_EQ(vars["Compiler"], "AC6");
+  EXPECT_EQ(vars["Dname"], "RteTest_ARMCM0");
+  EXPECT_EQ(vars["Dpack"], testcmsispack_folder + "/ARM/RteTest_DFP/0.2.0/");
+  EXPECT_EQ(vars["Pname"], "");
+  EXPECT_EQ(vars["Project"], "variables");
+  EXPECT_EQ(vars["Solution"], "variables");
+  EXPECT_EQ(vars["TargetType"], "TargetType1");
+  EXPECT_EQ(vars["VarBuildLayer"], "./variables/build1.clayer.yml");
+  EXPECT_EQ(vars["VarSolution"], "./variables/app.clayer.yml");
+  EXPECT_EQ(vars["VarSolutionDir"], testinput_folder + "/TestLayers/variables/solutionDir.clayer.yml");
+  EXPECT_EQ(vars["VarTargetLayer"], "./variables/target1.clayer.yml");
+}
+
+
 // end of ProjMgrRpcTests.cpp