address comments

usdot-fhwa-OPS · Nov 30, 2023 · bf290f5 · bf290f5
1 parent 040a99b
commit bf290f5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.devcontainer/docker-compose-vscode.yml b/.devcontainer/docker-compose-vscode.yml
@@ -24,7 +24,8 @@ services:
       - SIM_V2X_PORT=5757
       - SIM_INTERACTION_PORT=7576
       - V2X_PORT=8686
-      - INFRASTRUCTURE_ID=1
+      - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID>
+      - INFRASTRUCTURE_NAME=<RSU_NAME>
       - SENSOR_JSON_FILE_PATH=/var/www/plugins/MAP/sensors.json
     secrets:
       - mysql_password

diff --git a/configuration/amd64/docker-compose.yml b/configuration/amd64/docker-compose.yml
@@ -38,6 +38,8 @@ services:
       - db
     environment:
       - MYSQL_PASSWORD=/run/secrets/mysql_password
+      - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID>
+      - INFRASTRUCTURE_NAME=<RSU_NAME>
     secrets:
       - mysql_password
     volumes:

diff --git a/src/tmx/TmxUtils/src/simulation/SimulationEnvUtils.h b/src/tmx/TmxUtils/src/simulation/SimulationEnvUtils.h
@@ -66,6 +66,12 @@ namespace tmx::utils::sim{
          * for CDASim connection.
          */
         constexpr inline static const char *INFRASTRUCTURE_ID = "INFRASTRUCTURE_ID";
+
+        /**
+         * @brief Name of environment variable for storing infrastructure name of v2xhub. Only necessary in SIMULATION MODE 
+         * for CDASim connection.
+        */
+        constexpr inline static const char *INFRASTRUCTURE_NAME = "INFRASTRUCTURE_NAME";
         /**
          * @brief Function to return bool indicating whether V2X-Hub deployment is in SIMULATION MODE or not.
          * @return true if SIMULATION_MODE is "true" or "TRUE" and false otherwise.

diff --git a/src/v2i-hub/TelematicBridgePlugin/src/TelematicBridgePlugin.cpp b/src/v2i-hub/TelematicBridgePlugin/src/TelematicBridgePlugin.cpp
@@ -8,6 +8,9 @@ namespace TelematicBridge
     TelematicBridgePlugin::TelematicBridgePlugin(const string &name) : PluginClient(name)
     {
         _telematicUnitPtr = make_unique<TelematicUnit>();
+        _unitId = sim::get_sim_config("INFRASTRUCTURE_ID");
+        _unitName = sim::get_sim_config("INFRASTRUCTURE_NAME");
+        PLOG(logERROR) << "_unitId: "<< _unitId;
         UpdateConfigSettings();
         AddMessageFilter("*", "*", IvpMsgFlags_None);
         AddMessageFilter("J2735", "*", IvpMsgFlags_RouteDSRC);
@@ -45,8 +48,6 @@ namespace TelematicBridge
     {
         lock_guard<mutex> lock(_configMutex);
         GetConfigValue<string>("NATSUrl", _natsURL);
-        GetConfigValue<string>("UnitId", _unitId);
-        GetConfigValue<string>("UnitName", _unitName);
         GetConfigValue<string>("MessageExclusionList", _excludedMessages);
         unit_st unit = {_unitId, _unitName, UNIT_TYPE_INFRASTRUCTURE};
         if (_telematicUnitPtr)

diff --git a/src/v2i-hub/TelematicBridgePlugin/src/TelematicBridgePlugin.h b/src/v2i-hub/TelematicBridgePlugin/src/TelematicBridgePlugin.h
@@ -4,6 +4,7 @@
 #include "PluginClient.h"
 #include "TelematicBridgeMsgWorker.h"
 #include "TelematicUnit.h"
+#include <simulation/SimulationEnvUtils.h>
 
 
 namespace TelematicBridge