Added VehicleData Param CloudAppVehicleID to core

9 files changed, 25 insertions, 0 deletions

diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index d503ae34e5..8a75cd3dab 100644
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -412,6 +412,7 @@
                         "headLampStatus",

                         "instantFuelConsumption",

                         "fuelRange",

+                        "cloudAppVehicleID",

                         "odometer",

                         "tirePressure",

                         "vin",

@@ -432,6 +433,7 @@
                         "headLampStatus",

                         "instantFuelConsumption",

                         "fuelRange",

+                        "cloudAppVehicleID",

                         "odometer",

                         "tirePressure",

                         "vin",

@@ -452,6 +454,7 @@
                         "headLampStatus",

                         "instantFuelConsumption",

                         "fuelRange",

+                        "cloudAppVehicleID",

                         "odometer",

                         "tirePressure",

                         "wiperStatus"]

@@ -471,6 +474,7 @@
                         "headLampStatus",

                         "instantFuelConsumption",

                         "fuelRange",

+                        "cloudAppVehicleID",

                         "odometer",

                         "tirePressure",

                         "wiperStatus"]

diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 6e32853a3d..9b5f63809a 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -253,6 +253,7 @@ extern const char* fuel_level;
 extern const char* fuel_level_state;
 extern const char* instant_fuel_consumption;
 extern const char* fuel_range;
+extern const char* cloud_app_vehicle_id;
 extern const char* external_temp;
 extern const char* turn_signal;
 extern const char* vin;
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index e99db3bece..c5e40a18cf 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -176,6 +176,8 @@ std::pair<std::string,
                    mobile_apis::VehicleDataType::VEHICLEDATA_FUELCONSUMPTION),
     std::make_pair(strings::fuel_range,
                    mobile_apis::VehicleDataType::VEHICLEDATA_FUELRANGE),
+    std::make_pair(strings::cloud_app_vehicle_id, 
+                   mobile_apis::VehicleDataType::VEHICLEDATA_CLOUDAPPVEHICLEID),
     std::make_pair(strings::external_temp,
                    mobile_apis::VehicleDataType::VEHICLEDATA_EXTERNTEMP),
     std::make_pair(strings::turn_signal,
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index ff9ebb6208..e006b893f6 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -220,6 +220,7 @@ const char* fuel_level = "fuelLevel";
 const char* fuel_level_state = "fuelLevel_State";
 const char* instant_fuel_consumption = "instantFuelConsumption";
 const char* fuel_range = "fuelRange";
+const char* cloud_app_vehicle_id = "cloudAppVehicleID";
 const char* external_temp = "externalTemperature";
 const char* turn_signal = "turnSignal";
 const char* vin = "vin";
diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 34864c5602..e9d5319f13 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -96,6 +96,7 @@ enum Parameter {
   P_FUEL_RANGE,
   P_TIRE_PRESSURE_VALUE,
   P_TPMS,
+  P_CLOUD_APP_VEHICLE_ID,
   P_LONGTITUDE_DEGREES,
   P_LATITUDE_DEGREES,
   P_LOCATION_NAME,
diff --git a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
index 26af165506..0389986695 100644
--- a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
+++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
@@ -56,6 +56,7 @@
         <element name="fuelRange" />
         <element name="tirePressureValue" />
         <element name="tpms" />
+        <element name="cloudAppVehicleID" />
     </enum>
 
     <enum name="AppHMIType">
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 27db505e3f..29227adfc6 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -137,6 +137,8 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_FUELRANGE:
       return true;
+    case P_CLOUD_APP_VEHICLE_ID:
+      return true;
     case P_ODOMETER:
       return true;
     case P_TIREPRESSURE:
@@ -232,6 +234,8 @@ const char* EnumToJsonString(Parameter val) {
       return "instantFuelConsumption";
     case P_FUELRANGE:
       return "fuelRange";
+    case P_CLOUD_APP_VEHICLE_ID:
+      return "cloudAppVehicleID";
     case P_ODOMETER:
       return "odometer";
     case P_TIREPRESSURE:
@@ -336,6 +340,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("fuelRange" == literal) {
     *result = P_FUELRANGE;
     return true;
+  } else if ("cloudAppVehicleID" == literal) {
+    *result = P_CLOUD_APP_VEHICLE_ID;
+    return true;
   } else if ("odometer" == literal) {
     *result = P_ODOMETER;
     return true;
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
index 1f10db9f6f..f398e16020 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
@@ -86,6 +86,7 @@ enum Parameter {
   P_STEERINGWHEELANGLE,
   P_ENGINEOILLIFE,
   P_MYKEY,
+  P_CLOUD_APP_VEHICLE_ID,
   P_AIRBAGSTATUS,
   P_BODYINFORMATION,
   P_CLUSTERMODESTATUS,
diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc
index 428e18d0bd..bec9a2ec2d 100644
--- a/src/components/policy/policy_regular/src/policy_table/enums.cc
+++ b/src/components/policy/policy_regular/src/policy_table/enums.cc
@@ -138,6 +138,8 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_FUELRANGE:
       return true;
+    case P_CLOUD_APP_VEHICLE_ID:
+      return true;
     case P_ODOMETER:
       return true;
     case P_TIREPRESSURE:
@@ -204,6 +206,8 @@ const char* EnumToJsonString(Parameter val) {
       return "instantFuelConsumption";
     case P_FUELRANGE:
       return "fuelRange";
+    case P_CLOUD_APP_VEHICLE_ID:
+      return "cloudAppVehicleID";
     case P_ODOMETER:
       return "odometer";
     case P_TIREPRESSURE:
@@ -280,6 +284,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("fuelRange" == literal) {
     *result = P_FUELRANGE;
     return true;
+  } else if ("cloudAppVehicleID" == literal) {
+    *result = P_CLOUD_APP_VEHICLE_ID;
+    return true;
   } else if ("odometer" == literal) {
     *result = P_ODOMETER;
     return true;