Replace clusterModeStatus with clusterModes and vise versa (#3830)

3 files changed, 19 insertions, 6 deletions

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
index db3922e1a2..da79342681 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -226,9 +226,12 @@ bool SubscribeVehicleDataRequest::SubscribePendingVehicleData(
     } else {
       auto res_code =
           static_cast<hmi_apis::Common_VehicleDataResultCode::eType>(
-              msg_params[*vi_name][strings::result_code].asInt());
+              msg_params[ConvertRequestToResponseName(*vi_name)]
+                        [strings::result_code]
+                            .asInt());
       if (skiped_result_codes.find(res_code) != skiped_result_codes.end()) {
-        msg_params[*vi_name][strings::result_code] = res_code;
+        msg_params[ConvertRequestToResponseName(*vi_name)]
+                  [strings::result_code] = res_code;
         vi_name = vi_waiting_for_subscribe_.erase(vi_name);
       } else {
         ++vi_name;
@@ -325,11 +328,13 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions(
         }
         SDL_LOG_DEBUG("App with connection key "
                       << connection_key()
-                      << " have been subscribed for VehicleDataType: "
+                      << " has been subscribed for VehicleDataType: "
                       << key_name);
         vi_already_subscribed_by_another_apps_.insert(key_name);
-        out_response_params[key_name][strings::data_type] = vd_type;
-        out_response_params[key_name][strings::result_code] =
+        const std::string converted_name =
+            ConvertRequestToResponseName(key_name);
+        out_response_params[converted_name][strings::data_type] = vd_type;
+        out_response_params[converted_name][strings::result_code] =
             mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
         ++subscribed_items;
       };
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
index e04e529a67..e6d0ff5d4c 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
@@ -98,7 +98,8 @@ void UnsubscribeVehicleDataRequest::Run() {
         "VehicleDataType: "
         << key_name);
     vi_still_subscribed_by_another_apps_.insert(key_name);
-    response_params_[key_name][strings::result_code] =
+    const std::string converted_name = ConvertRequestToResponseName(key_name);
+    response_params_[converted_name][strings::result_code] =
         mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
   };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc
index c9affa5760..faa7aa258e 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_pending_resumption_handler.cc
@@ -223,6 +223,13 @@ void VehicleInfoPendingResumptionHandler::HandleOnEvent(
   custom_vehicle_data_manager_.CreateMobileMessageParams(converted_msg_params);
   response_message[strings::msg_params] = converted_msg_params;
 
+  if (converted_msg_params.enumerate().end() !=
+      converted_msg_params.enumerate().find(strings::cluster_modes)) {
+    response_message[strings::msg_params][strings::cluster_mode_status] =
+        response_message[strings::msg_params][strings::cluster_modes];
+    response_message[strings::msg_params].erase(strings::cluster_modes);
+  }
+
   const auto vs_count_in_response =
       response_message[application_manager::strings::msg_params].length();