3 files changed, 22 insertions, 70 deletions
diff --git a/tests/mobility_eth0_latency_2s1r/mobility.py b/tests/mobility_eth0_latency_2s1r/mobility.py
new file mode 100755
index 0000000..99839b9
--- /dev/null
+++ b/tests/mobility_eth0_latency_2s1r/mobility.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+def callback(simulator):
+    simulator.log("Network update!")
+    B=simulator.netmat["eth0"]["bandwidth"]
+    new_lat_eth0=simulator.netmat["eth0"]["latency"]+1/2
+    simulator.update_network({"eth0":{"bandwidth":B, "latency":new_lat_eth0, "is_wired":True}})
diff --git a/tests/mobility_eth0_latency_2s1r/simulator.py b/tests/mobility_eth0_latency_2s1r/platform.yaml
index 17562de..b35ab2e 100755..100644
--- a/tests/mobility_eth0_latency_2s1r/simulator.py
+++ b/tests/mobility_eth0_latency_2s1r/platform.yaml
@@ -1,9 +1,3 @@
-#!/usr/bin/env python
-
-# Load ESDS
-import esds
-import numpy as np
-
 ########## Scenario ##########
 # Notations:
 #   - Remaining communication duration (last communication ends minus current simulated time) = C
@@ -25,18 +19,20 @@ import numpy as np
 # |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------|
 ##############################
 
-B=np.full((3,3),8)
-L=np.full((3,3),0)
-s=esds.Simulator({"wlan0":{"bandwidth":B, "latency":L, "is_wired":False}, "eth0":{"bandwidth":B, "latency":L, "is_wired":True}})
-
-s.create_node("sender")
-s.create_node("sender")
-s.create_node("receiver")
+general:
+  breakpoints_every: 1
+  breakpoints_callback:
+        file: "mobility.py"
+        callback: "callback"
 
-def callback(simulator):
-    simulator.log("Network update!")
-    new_lat_wlan0=simulator.netmat["wlan0"]["latency"]+1/2
-    new_lat_eth0=simulator.netmat["eth0"]["latency"]+1/2
-    simulator.update_network({"wlan0":{"bandwidth":B, "latency":new_lat_wlan0, "is_wired":False},"eth0":{"bandwidth":B, "latency":new_lat_eth0, "is_wired":True}})
+nodes:
+  count: 3
+  implementations:
+    - 0,1 sender.py
+    - 2 receiver.py
 
-s.run(breakpoints_every=1,breakpoint_callback=callback)
+interfaces:
+  eth0:
+    type: "wired"
+    links:
+      - all 1Bps 0s all
+\ No newline at end of file
diff --git a/tests/mobility_eth0_latency_2s1r/yoctosim.debug b/tests/mobility_eth0_latency_2s1r/yoctosim.debug
deleted file mode 100644
index efe50d9..0000000
--- a/tests/mobility_eth0_latency_2s1r/yoctosim.debug
+++ /dev/null
@@ -1,51 +0,0 @@
-Python version 3.10.5 (main, Jun  6 2022, 18:49:26) [GCC 12.1.0]
-Simulation started at 1654802960.9297695
-Number of nodes is 3
-Manual breakpoints list: []
-Breakpoints every 1s
------------------------------------------------
-Started since 0.08s
-Simulated time 0.000s (or more precisely 0s)
-Node number per state: pending=2 terminated=1 
-Node sharing: n2=2 
-Ids of node in timeout mode: 
-Sorted events list:
-[[3 1 array(0, dtype=object) 0]
- [0 2.0 array([0, 2, 'eth0', 'Hello World!', 1, 2.0, 1, 0], dtype=object)
-  1]
- [0 2.0 array([1, 2, 'eth0', 'Hello World!', 1, 2.0, 1, 0], dtype=object)
-  1]]
------------------------------------------------
-Started since 0.08s
-Simulated time 1.000s (or more precisely 1s)
-Node number per state: pending=2 terminated=1 
-Node sharing: n2=2 
-Ids of node in timeout mode: 
-Sorted events list:
-[[3 2 array(0, dtype=object) 0]
- [0 2.25
-  array([0, 2, 'eth0', 'Hello World!', 1, 1.25, 0.5, 0], dtype=object) 1]
- [0 2.25
-  array([1, 2, 'eth0', 'Hello World!', 1, 1.25, 0.5, 0], dtype=object) 1]]
------------------------------------------------
-Started since 0.08s
-Simulated time 2.000s (or more precisely 2s)
-Node number per state: pending=2 terminated=1 
-Node sharing: n2=2 
-Ids of node in timeout mode: 
-Sorted events list:
-[[0 2.3
-  array([0, 2, 'eth0', 'Hello World!', 1, 0.30000000000000004, 0.1, 0],
-        dtype=object)                                                   1]
- [0 2.3
-  array([1, 2, 'eth0', 'Hello World!', 1, 0.30000000000000004, 0.1, 0],
-        dtype=object)                                                   1]
- [3 3 array(0, dtype=object) 0]]
------------------------------------------------
-Started since 0.09s
-Simulated time 2.300s (or more precisely 2.3s)
-Node number per state: terminated=3 
-Node sharing: 
-Ids of node in timeout mode: 
-Sorted events list:
-[[3 3 array(0, dtype=object) 0]]