Update all integration tests and debug platform parsing

3 files changed, 22 insertions, 56 deletions

diff --git a/tests/mobility_eth0_bandwidth_2s1r/mobility.py b/tests/mobility_eth0_bandwidth_2s1r/mobility.py
new file mode 100755
index 0000000..5c9101d
--- /dev/null
+++ b/tests/mobility_eth0_bandwidth_2s1r/mobility.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+def callback(simulator):
+    simulator.log("Network update!")
+    new_bw_eth0=simulator.netmat["eth0"]["bandwidth"]*2
+    simulator.update_network({"eth0":{"bandwidth":new_bw_eth0, "latency":simulator.netmat["eth0"]["latency"], "is_wired":True}})
+
diff --git a/tests/mobility_eth0_bandwidth_2s1r/simulator.py b/tests/mobility_eth0_bandwidth_2s1r/platform.yaml
index 9840692..6ebc1ad 100755..100644
--- a/tests/mobility_eth0_bandwidth_2s1r/simulator.py
+++ b/tests/mobility_eth0_bandwidth_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
@@ -24,18 +18,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_bw_wlan0=simulator.netmat["wlan0"]["bandwidth"]*2
-    new_bw_eth0=simulator.netmat["eth0"]["bandwidth"]*2
-    simulator.update_network({"wlan0":{"bandwidth":new_bw_wlan0, "latency":L, "is_wired":False}, "eth0":{"bandwidth":new_bw_eth0, "latency":L, "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_bandwidth_2s1r/yoctosim.debug b/tests/mobility_eth0_bandwidth_2s1r/yoctosim.debug
deleted file mode 100644
index b0e4327..0000000
--- a/tests/mobility_eth0_bandwidth_2s1r/yoctosim.debug
+++ /dev/null
@@ -1,37 +0,0 @@
-Python version 3.10.5 (main, Jun  6 2022, 18:49:26) [GCC 12.1.0]
-Simulation started at 1654802959.3233912
-Number of nodes is 3
-Manual breakpoints list: []
-Breakpoints every 1s
------------------------------------------------
-Started since 0.04s
-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.04s
-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:
-[[0 1.5
-  array([0, 2, 'eth0', 'Hello World!', 1, 0.5, 0.5, 0], dtype=object) 1]
- [0 1.5
-  array([1, 2, 'eth0', 'Hello World!', 1, 0.5, 0.5, 0], dtype=object) 1]
- [3 2 array(0, dtype=object) 0]]
------------------------------------------------
-Started since 0.05s
-Simulated time 1.500s (or more precisely 1.5s)
-Node number per state: terminated=3 
-Node sharing: 
-Ids of node in timeout mode: 
-Sorted events list:
-[[3 2 array(0, dtype=object) 0]]