iml130 · ltoenning · Sep 21, 2023 · Sep 18, 2023 · Sep 18, 2023
diff --git a/daisi/scenarios/cpps/default.yml b/daisi/scenarios/cpps/default.yml
@@ -1,8 +1,8 @@
 title: CPPS Default Scenario
 version: 0.1
-stop_time: 5000
+stop_time: 5000s
 random_seed: 42
-default_delay: 5
+default_delay: 5s
 
 # outdated/unused fields
 # only present until Manager switches to new scenariofile parser as well
@@ -104,35 +104,35 @@ scenario_sequence:
   - amr:
     entity: amr
     friendly_name: FPckg
-    start_time: 0
+    start_time: 0s
     spawn_distribution:
       type: absolute
       number: 3
   - amr:
     entity: amr
     friendly_name: SPckg
-    start_time: 0
+    start_time: 0s
     spawn_distribution:
       type: absolute
       number: 3
   - amr:
     entity: amr
     friendly_name: WEuro
-    start_time: 0
+    start_time: 0s
     spawn_distribution:
       type: absolute
       number: 3
   - amr:
     entity: amr
     friendly_name: SEuro
-    start_time: 0
+    start_time: 0s
     spawn_distribution:
       type: absolute
       number: 3
   - mf:
     entity: mf
     friendly_name: mf1
-    start_time: 0
+    start_time: 0s
     spawn_distribution:
       type: gaussian
       mean: 100

diff --git a/daisi/scenarios/entity_search/example.yml b/daisi/scenarios/entity_search/example.yml
@@ -1,9 +1,9 @@
 # required
 title: Entity Search example with 10 attributes
 version: 0.1
-stop_time: 3600000 # 1 hour
+stop_time: 1h
 random_seed: 2
-default_delay: 5000
+default_delay: 5s
 
 # outdated/unused fields
 # only present until Manager switches to new scenariofile parser as well

diff --git a/daisi/scenarios/minhton/default.yml b/daisi/scenarios/minhton/default.yml
@@ -1,8 +1,8 @@
 title: MINHTON default scenario
 version: 0.1
-stop_time: 10000000
+stop_time: 10000s
 random_seed: 1
-default_delay: 5000
+default_delay: 5s
 
 # outdated/unused fields
 # only present until Manager switches to new scenariofile parser as well

diff --git a/daisi/scenarios/natter/default.yml b/daisi/scenarios/natter/default.yml
@@ -1,8 +1,8 @@
 title: Test
 version: 0.1
-stop_time: 5000
+stop_time: 5000s
 random_seed: 1
-default_delay: 500
+default_delay: 0.5s
 
 # outdated/unused fields
 # only present until Manager switches to new scenariofile parser as well
@@ -18,6 +18,6 @@ scenario_sequence:
       mode: minhton
     - type: publish
       number: 5
-      delay: 0
+      delay: 0s
       mode: random # random, sequential
       message_size: 100 # in bytes
diff --git a/daisi/scenarios/sola/default.yml b/daisi/scenarios/sola/default.yml
@@ -1,8 +1,8 @@
 title: SOLA default scenario
 version: 0.1
-stop_time: 4294967296
+stop_time: 4294967296ms
 random_seed: 1
-default_delay: 500
+default_delay: 0.5s
 
 # outdated/unused fields
 # only present until Manager switches to new scenariofile parser as well
@@ -14,14 +14,14 @@ number_nodes: 3
 
 scenario_sequence:
   - type: start_sola
-    delay: 1000
+    delay: 1s
   - type: delay
-    delay: 0
+    delay: 0s
   - type: subscribe_topic
     topic: "helloworld"
-    delay: 1000
+    delay: 1s
   - type: delay
-    delay: 0
+    delay: 0s
   - type: publish
     topic: "helloworld"
     message_size: 100 # bytes

diff --git a/daisi/src/cpps/common/cpps_manager.cpp b/daisi/src/cpps/common/cpps_manager.cpp
@@ -145,7 +145,7 @@ void CppsManager::setup() {
 void CppsManager::initialSpawn() {
   uint32_t previous_index = 0;
 
-  while (!spawn_info_.empty() && spawn_info_.top().start_time == 0) {
+  while (!spawn_info_.empty() && spawn_info_.top().start_time == ns3::Time(0)) {
     auto info = spawn_info_.top();
     spawn_info_.pop();
 
@@ -514,24 +514,24 @@ void CppsManager::scheduleMaterialFlow(const SpawnInfoScenario &info) {
 
 void CppsManager::scheduleEvents() {
   Simulator::Schedule(Seconds(1), &CppsManager::clearFinishedMaterialFlows, this);
-  uint64_t current_time = Simulator::Now().GetSeconds();
-  uint64_t delay = scenario_.default_delay;
+  ns3::Time current_time = Simulator::Now();
+  const ns3::Time delay = scenario_.default_delay;
 
   for (auto i = 0U; i < scenario_.initial_number_of_amrs; i++) {
     current_time += delay;
-    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), Seconds(current_time),
-                                   &CppsManager::initAMR, this, i);
+    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), current_time, &CppsManager::initAMR,
+                                   this, i);
   }
 
   for (auto i = 0U; i < scenario_.initial_number_of_amrs; i++) {
     current_time += delay;
-    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), Seconds(current_time),
+    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), current_time,
                                    &CppsManager::connectAMR, this, i);
   }
 
   for (auto i = 0U; i < scenario_.initial_number_of_amrs; i++) {
     current_time += delay;
-    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), Seconds(current_time),
+    Simulator::ScheduleWithContext(this->amrs_.Get(i)->GetId(), current_time,
                                    &CppsManager::startAMR, this, i);
   }
 
@@ -540,8 +540,8 @@ void CppsManager::scheduleEvents() {
     auto info = schedule_info_.top();
     schedule_info_.pop();
     current_time += delay;
-    Simulator::Schedule(Seconds(current_time + info.start_time), &CppsManager::scheduleMaterialFlow,
-                        this, info);
+    Simulator::Schedule(current_time + info.start_time, &CppsManager::scheduleMaterialFlow, this,
+                        info);
   }
 }
 

diff --git a/daisi/src/cpps/common/scenariofile/CMakeLists.txt b/daisi/src/cpps/common/scenariofile/CMakeLists.txt
@@ -45,4 +45,5 @@ target_link_libraries(daisi_cpps_common_scenariofile_spawn_info_scenario
     INTERFACE
     daisi_manager_scenariofile_component
     yaml-cpp
+    ns3::libcore
 )
diff --git a/daisi/src/cpps/common/scenariofile/spawn_info_scenario.h b/daisi/src/cpps/common/scenariofile/spawn_info_scenario.h
@@ -18,6 +18,7 @@
 #define DAISI_CPPS_MANAGER_SPAWN_INFO_SCENARIO_H_
 
 #include "manager/scenariofile_component.h"
+#include "ns3/core-module.h"
 
 namespace daisi::cpps {
 
@@ -57,14 +58,14 @@ struct SpawnDistributionScenario {
 struct SpawnInfoScenario {
   std::string entity;
   std::string friendly_name;
-  uint64_t start_time;
+  ns3::Time start_time;
 
   SpawnDistributionScenario spawn_distribution;
 
   void parse(YAML::Node node) {
     SERIALIZE_VAR(entity);
     SERIALIZE_VAR(friendly_name);
-    SERIALIZE_VAR(start_time);
+    SERIALIZE_NS3_TIME(start_time);
 
     SERIALIZE_VAR(spawn_distribution);
   }

diff --git a/daisi/src/manager/CMakeLists.txt b/daisi/src/manager/CMakeLists.txt
@@ -44,6 +44,7 @@ target_sources(daisi_manager_scenariofile_component
 target_link_libraries(daisi_manager_scenariofile_component
     INTERFACE
     yaml-cpp
+    ns3::libcore
 )
 
 add_library(daisi_manager_general_scenariofile INTERFACE)
@@ -55,6 +56,7 @@ target_link_libraries(daisi_manager_general_scenariofile
     INTERFACE
     daisi_manager_scenariofile_component
     yaml-cpp
+    ns3::libcore
 )
 
 add_library(daisi_manager_core_network)

diff --git a/daisi/src/manager/general_scenariofile.h b/daisi/src/manager/general_scenariofile.h
@@ -20,6 +20,7 @@
 #include <fstream>
 #include <string>
 
+#include "ns3/core-module.h"
 #include "scenariofile_component.h"
 
 namespace daisi {
@@ -35,8 +36,8 @@ struct GeneralScenariofile {
 
     SERIALIZE_VAR(random_seed);
 
-    SERIALIZE_VAR(stop_time);
-    SERIALIZE_VAR(default_delay);
+    SERIALIZE_NS3_TIME(stop_time);
+    SERIALIZE_NS3_TIME(default_delay);
 
     SERIALIZE_VAR(output_path);
   }
@@ -69,8 +70,8 @@ struct GeneralScenariofile {
   uint64_t random_seed = 0;
 
   // simulation information
-  uint64_t stop_time = 0;
-  uint64_t default_delay = 0;
+  ns3::Time stop_time;
+  ns3::Time default_delay;
 
   std::optional<std::string> output_path;
 

diff --git a/daisi/src/manager/scenariofile_component.h b/daisi/src/manager/scenariofile_component.h
@@ -22,8 +22,23 @@
 #include <optional>
 #include <variant>
 
+#include "ns3/core-module.h"
+
 #define STRING_NAME(VAR_NAME) #VAR_NAME
 #define SERIALIZE_VAR(VAR) serializeType(VAR, STRING_NAME(VAR), node);
+#define SERIALIZE_NS3_TIME(VAR)                      \
+  {                                                  \
+    std::string internal;                            \
+    serializeType(internal, STRING_NAME(VAR), node); \
+    VAR = ns3::Time(internal);                       \
+  }
+
+#define SERIALIZE_NS3_TIME_OPTIONAL(VAR)             \
+  {                                                  \
+    std::optional<std::string> internal;             \
+    serializeType(internal, STRING_NAME(VAR), node); \
+    if (internal) VAR = ns3::Time(internal.value()); \
+  }
 
 namespace daisi {
 

diff --git a/daisi/src/minhton-ns3/CMakeLists.txt b/daisi/src/minhton-ns3/CMakeLists.txt
@@ -86,6 +86,7 @@ target_sources(daisi_minhton_scenario_steps INTERFACE scenario_steps.h)
 target_link_libraries(daisi_minhton_scenario_steps
         INTERFACE
             daisi_manager_scenariofile_component
+            ns3::libcore
 )
 target_include_directories(daisi_minhton_scenario_steps
         INTERFACE