Merge pull request #12 from c-jimenez/dev/add_cp_config_in_diag_zip

Dev/add cp config in diag zip

Author: c-jimenez

docker/Dockerfile_cp_simulator

@@ -14,9 +14,10 @@ COPY gcc_native/config.ini /var/chargepoint/config.ini
 RUN chown ${simu_uid}:${simu_gid} /var/chargepoint/config.ini
 
 COPY gcc_native  /cp_simulator
+COPY cp_simu_entrypoint.sh /cp_simu_entrypoint.sh
 
 USER cp_simu
 
 WORKDIR "/var/chargepoint"
 
-ENTRYPOINT  ["/cp_simulator/chargepoint"]
+ENTRYPOINT  ["/cp_simu_entrypoint.sh"]

docker/Entrypoint/cp_simu_entrypoint.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+cp_args=""
+diagnostic_file_size=0
+
+for i in "$@"; do
+  case $i in
+    --diagnostic_file_size*)
+      diagnostic_file_size="$2"
+      shift
+      ;;
+    -*)
+      cp_args+=" $i $2"
+      shift
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+
+# create big file and add it in diagnostic zip of charge point
+if [ $diagnostic_file_size -gt 0 ]
+then
+  echo "generate $diagnostic_file_size random strings in cp config file"
+  echo "$(tr -dc A-Za-z0-9 < /dev/urandom | head -c $diagnostic_file_size)" >>  /var/chargepoint/blob.txt
+  cp_args+=" -f blob.txt"
+fi
+
+# start simulator
+echo "start charpoint with arguments : $cp_args"
+/cp_simulator/chargepoint $cp_args

makefile

@@ -104,11 +104,12 @@ docker-build-simu-compile:
 	@${DOCKER_BUILD}  -f docker/Dockerfile -t $(DOCKER_COMPILE_IMAGE)  $(ROOT_DIR)/docker
 
 docker-build-cp-simulator:
+	cp docker/Entrypoint/cp_simu_entrypoint.sh $(ROOT_DIR)/bin/
 	@${DOCKER_BUILD}  -f docker/Dockerfile_cp_simulator -t $(DOCKER_SIMULATOR_IMAGE)  $(ROOT_DIR)/bin/
 
 
 run-simu:
-	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-simu $(DOCKER_SIMULATOR_IMAGE) -c test_ocpp
+	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-simu $(DOCKER_SIMULATOR_IMAGE)
 
 run-launcher:
 	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-launcher --entrypoint /cp_simulator/launcher $(DOCKER_SIMULATOR_IMAGE)

src/chargepoint/config/SimulatedChargePointConfig.h

@@ -30,20 +30,25 @@ SOFTWARE.
 #include "OcppConfig.h"
 
 #include <openocpp/IniFile.h>
+#include <set>
 
 /** @brief Configuration of the simulated charge point */
 class SimulatedChargePointConfig
 {
   public:
     /** @brief Constructor */
-    SimulatedChargePointConfig(const std::string& working_dir, const std::string& config_file)
-        : m_working_dir(working_dir), m_config(config_file), m_stack_config(m_config), m_ocpp_config(m_config), m_mqtt_config(m_config)
+    SimulatedChargePointConfig(const std::string& working_dir, const std::string& config_file, std::set<std::string>& diag_files)
+        : m_working_dir(working_dir), m_config(config_file), m_stack_config(m_config), m_ocpp_config(m_config), m_mqtt_config(m_config),
+          m_diag_files(diag_files)
     {
     }
 
     /** @brief Working directory */
     const std::string& workingDir() const { return m_working_dir; }
 
+    /** @brief files to put diagnostic zip */
+    const std::set<std::string>& diagFiles() const { return m_diag_files; }
+
     /** @brief Stack internal configuration */
     ocpp::config::IChargePointConfig& stackConfig() { return m_stack_config; }
 
@@ -67,6 +72,8 @@ class SimulatedChargePointConfig
     std::string m_working_dir;
     /** @brief Configuration file */
     ocpp::helpers::IniFile m_config;
+    /** @brief files to put diagnostic zip */
+    std::set<std::string> m_diag_files;
 
     /** @brief Stack internal configuration */
     ChargePointConfig m_stack_config;

src/chargepoint/main.cpp

@@ -33,6 +33,7 @@ SOFTWARE.
 #include <iostream>
 #include <string.h>
 #include <thread>
+#include <set>
 
 using namespace std;
 
@@ -73,6 +74,7 @@ int main(int argc, char* argv[])
     std::string  mqtt_broker_url          = "tcp://localhost:1883";
     unsigned int max_charge_point_current = 32u;
     unsigned int max_connector_current    = 32u;
+    std::set<std::string> diag_files     = {"ocpp.db"};
 
     // Check parameters
     if (argc > 1)
@@ -140,6 +142,19 @@ int main(int argc, char* argv[])
                 argc--;
                 max_connector_current = static_cast<unsigned int>(std::atoi(*argv));
             }
+            else if ((strcmp(*argv, "-f") == 0) && (argc > 1))
+            {
+                argv++;
+                argc--;
+                // add all files in diag file list:
+                diag_files.insert(*argv);
+                while((argc > 2) && (*argv[1] != '-'))
+                {
+                    argv++;
+                    argc--;
+                    diag_files.insert(*argv);
+                }
+            }
             else
             {
                 param     = *argv;
@@ -168,14 +183,16 @@ int main(int argc, char* argv[])
             std::cout << "    -b : URL of the MQTT broker (Default = tcp://localhost:1883)" << std::endl;
             std::cout << "    -m : Max current in A for the whole Charge Point (Default = 32A)" << std::endl;
             std::cout << "    -i : Max current in A for a connector of the Charge Point (Default = 32A)" << std::endl;
+            std::cout << "    -f : Files to put in diagnostic zip. Absolute path or relative path from working directory. " << std::endl;
+            std::cout <<          "Default = [ocpp.db]" << std::endl;
             return 1;
         }
     }
 
     // Open configuration file
     std::filesystem::path path(working_dir);
     path /= "config.ini";
-    SimulatedChargePointConfig config(working_dir, path.string());
+    SimulatedChargePointConfig config(working_dir, path.string(), diag_files);
 
     // Update configuration file
     std::filesystem::path db_path(working_dir);

src/chargepoint/ocpp/ChargePointEventsHandler.cpp

@@ -360,7 +360,21 @@ std::string ChargePointEventsHandler::getDiagnostics(const ocpp::types::Optional
     std::string diag_file = "/tmp/diag.zip";
 
     std::stringstream ss;
-    ss << "zip " << diag_file << " " << m_config.stackConfig().databasePath();
+    ss << "zip " << diag_file;
+
+    for (auto filename : m_config.diagFiles()) {
+        std::string filepath = filename;
+        if (filepath[0] != '/') {
+            filepath = m_config.workingDir() + "/" + filepath;
+        }
+        if (std::filesystem::exists(filepath))
+        {
+            ss << " " << filepath;
+        } else {
+             cout << "Unable to add file " << filepath << " in diagnostic zip: not found" << endl;
+        }
+    }
+
     int err = WEXITSTATUS(system(ss.str().c_str()));
     cout << "Command line : " << ss.str() << " => " << err << endl;