Moved mapping from module types to module data and capabilities keys in one place

2 files changed, 14 insertions, 1 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
index 4116777747..cf3c6cd5e4 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
@@ -57,6 +57,20 @@ class RCHelpers {
   GetModuleTypeToDataMapping();
 
   /**
+  * @brief GetModuleTypeToDataMapping get mapping of module type enum naming to
+  * actual module capabilities key
+  * @return module mapping from enum naming to capabilities key
+  */
+  static const std::function<std::string(const std::string& module_type)>
+  GetModuleTypeToCapabilitiesMapping();
+
+  /**
+   * @brief GetModulesList get list of all known modules
+   * @return vector contains all known modules
+   */
+  static const std::vector<std::string> GetModulesList();
+
+  /**
    * @brief GetRCExtension extract RC extension from application
    * @param app application to extract extension
    * @return rc extension of app is rc applicaiton, otherwise return emty shared
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
index d7d3a4743f..b359ee4d29 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
@@ -190,7 +190,6 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
    */
   void SetResourceFree(const std::string& module_type, const uint32_t app_id);
 
-  std::vector<std::string> all_supported_modules();
   /**
    * @brief AllocatedResources contains link between resource and application
    * owning that resource