henry/SimControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: added new way of passing config vars and updated dockerfile

Browse Source
This commit is contained in:
Henry Winkel
2023-11-09 17:31:38 +01:00
parent c8ee1da010
commit 09a72a0ac1
5 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -48,7 +48,7 @@ COPY build/libs/SimCore/libs/geographiclib/src/libGeographicLib.so.23 /usr/lib/
COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/ COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/
COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1 /usr/lib/ COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1 /usr/lib/
# COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/ # COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/ # COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
COPY build/libs/SimCore/libs/crossguid/libcrossguid-dgb.so.0 /usr/lib/ COPY build/libs/SimCore/libs/crossguid/libcrossguid-dgb.so.0 /usr/lib/
COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0 /usr/lib/ COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0 /usr/lib/

2
libs/KubeControl

Submodule libs/KubeControl updated: f59652ada1...f11742ce64

2
libs/OrderLibrary

Submodule libs/OrderLibrary updated: 3c86a057ce...a33016976e

2
libs/SimCore

Submodule libs/SimCore updated: 7bb7c4bb8e...630e8c4d74

39
src/SimControl/SimControl.cpp
View File

@@ -274,14 +274,32 @@ namespace SimControl {
{ {
std::string uuid = name; std::string uuid = name;
kubecontrol::KubePod ShipPod1("controller",uuid,"ship","ship:latest",Namespace_); kubecontrol::KubePod ShipPod1("controller",uuid,"ship","ship:latest",Namespace_);
ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
ShipPod1.setEnvironmentVar("ENTITY_NAME", "hamburg"); nlohmann::json vars;
ShipPod1.setEnvironmentVar("POS_LAT", "\"55\""); vars["ENTITY_ID"] = uuid;
ShipPod1.setEnvironmentVar("POS_LONG", "\"8\""); vars["ENTITY_NAME"] = "hamburg";
ShipPod1.setEnvironmentVar("POS_HEIGHT", "\"0\""); vars["POSITION"]["LAT"] = "55";
ShipPod1.setEnvironmentVar("GROUNDTRUTH_PORT", "\""+std::to_string(this->GroundTruthPort_)+"\""); vars["POSITION"]["LON"] = "8";
ShipPod1.setEnvironmentVar("GROUNDTRUTH_ADDR", "\""+this->GroundTruthAddr_+"\""); vars["POSITION"]["Height"] = "0";
ShipPod1.setEnvironmentVar("COMMAND_PORT", "\""+CommandPort_+"\""); vars["COURSE"] = "0";
vars["SPEED"] = "0";
vars["GROUNDTRUTH_PORT"] = std::to_string(this->GroundTruthPort_);
vars["GROUNDTRUTH_ADDR"] = this->GroundTruthAddr_;
vars["COMMAND_PORT"] = CommandPort_;
vars["ENTITY_RCS"] = std::to_string(850);
vars["ENTITY_SENSORS"].push_back("radar:latest");
ShipPod1.setEnvironmentVar("CONFIG", vars.dump());
// ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
// ShipPod1.setEnvironmentVar("ENTITY_NAME", "hamburg");
// ShipPod1.setEnvironmentVar("POS_LAT", "\"55\"");
// ShipPod1.setEnvironmentVar("POS_LONG", "\"8\"");
// ShipPod1.setEnvironmentVar("POS_HEIGHT", "\"0\"");
// ShipPod1.setEnvironmentVar("GROUNDTRUTH_PORT", "\""+std::to_string(this->GroundTruthPort_)+"\"");
// ShipPod1.setEnvironmentVar("GROUNDTRUTH_ADDR", "\""+this->GroundTruthAddr_+"\"");
// ShipPod1.setEnvironmentVar("COMMAND_PORT", "\""+CommandPort_+"\"");
ShipPod1.createYAML(); ShipPod1.createYAML();
PodController_->startPod(ShipPod1); PodController_->startPod(ShipPod1);
@@ -307,6 +325,9 @@ namespace SimControl {
vars["GROUNDTRUTH_PORT"] = std::to_string(this->GroundTruthPort_); vars["GROUNDTRUTH_PORT"] = std::to_string(this->GroundTruthPort_);
vars["GROUNDTRUTH_ADDR"] = this->GroundTruthAddr_; vars["GROUNDTRUTH_ADDR"] = this->GroundTruthAddr_;
vars["COMMAND_PORT"] = CommandPort_; vars["COMMAND_PORT"] = CommandPort_;
vars["ENTITY_RCS"] = std::to_string(850);
vars["ENTITY_SENSORS"].push_back("radar:latest");
ShipPod1.setEnvironmentVar("ENTITY_ID", uuid); ShipPod1.setEnvironmentVar("ENTITY_ID", uuid);
ShipPod1.setEnvironmentVar("ENTITY_NAME", Name); ShipPod1.setEnvironmentVar("ENTITY_NAME", Name);
@@ -423,7 +444,7 @@ namespace SimControl {
int counter = 0; int counter = 0;
double distance = 10000; double distance = 10000;
int rasterSize = 10; int rasterSize = 5;
for (int i = 0; i < rasterSize; i++ ) for (int i = 0; i < rasterSize; i++ )
{ {