From be6dafcd106ff9c50c9fa316685874773f6b251e Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Tue, 13 Sep 2022 15:49:38 +0200
Subject: Update all integration tests and debug platform parsing

---
 tests/mobility_eth0_bandwidth_1s1r/mobility.py   |  8 +++++
 tests/mobility_eth0_bandwidth_1s1r/platform.yaml | 41 ++++++++++++++++++++++++
 tests/mobility_eth0_bandwidth_1s1r/simulator.py  | 38 ----------------------
 3 files changed, 49 insertions(+), 38 deletions(-)
 create mode 100755 tests/mobility_eth0_bandwidth_1s1r/mobility.py
 create mode 100644 tests/mobility_eth0_bandwidth_1s1r/platform.yaml
 delete mode 100755 tests/mobility_eth0_bandwidth_1s1r/simulator.py

(limited to 'tests/mobility_eth0_bandwidth_1s1r')

diff --git a/tests/mobility_eth0_bandwidth_1s1r/mobility.py b/tests/mobility_eth0_bandwidth_1s1r/mobility.py
new file mode 100755
index 0000000..1b31e49
--- /dev/null
+++ b/tests/mobility_eth0_bandwidth_1s1r/mobility.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+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":simulator.netmat["wlan0"]["latency"], "is_wired":False}, "eth0":{"bandwidth":new_bw_eth0, "latency":simulator.netmat["eth0"]["latency"], "is_wired":True}})
+
diff --git a/tests/mobility_eth0_bandwidth_1s1r/platform.yaml b/tests/mobility_eth0_bandwidth_1s1r/platform.yaml
new file mode 100644
index 0000000..145baf4
--- /dev/null
+++ b/tests/mobility_eth0_bandwidth_1s1r/platform.yaml
@@ -0,0 +1,41 @@
+########## Scenario ##########
+# Notations:
+#   - Remaining communication duration (last communication ends minus current simulated time) = C
+#   - Last communication duration (previous row) = U
+#   - Last remaining data size (previous row) = D
+#   - Current remaining data (current row) = R
+#   - Initial data size (first row) = I
+#   - Bandwidth = BW
+#   - Latency = L
+# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
+# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) |
+# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
+# |                 0 |          0 |              8 | 8                    | 1                         |                        1 |
+# |               0.5 |          0 |             16 | C/U*D = 4            | R/I * L + R/BW = 0.25     |                     0.75 |
+# |              0.75 |          0 |             16 |                      |                           |                          |
+# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
+##############################
+
+general:
+  breakpoints_every: 0.5 
+  breakpoints_callback:
+        file: "mobility.py"
+        callback: "callback"
+
+nodes:
+  count: 2
+  implementations:
+    - 0 sender.py
+    - 1 receiver.py
+
+interfaces:
+  wlan0:
+    type: "wireless"
+    links:
+      - all 1Bps 0s all
+    txperfs:
+      - all 1Bps 0s
+  eth0:
+    type: "wired"
+    links:
+      - all 1Bps 0s all
\ No newline at end of file
diff --git a/tests/mobility_eth0_bandwidth_1s1r/simulator.py b/tests/mobility_eth0_bandwidth_1s1r/simulator.py
deleted file mode 100755
index 39ce86a..0000000
--- a/tests/mobility_eth0_bandwidth_1s1r/simulator.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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
-#   - Last communication duration (previous row) = U
-#   - Last remaining data size (previous row) = D
-#   - Current remaining data (current row) = R
-#   - Initial data size (first row) = I
-#   - Bandwidth = BW
-#   - Latency = L
-# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
-# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) |
-# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
-# |                 0 |          0 |              8 | 8                    | 1                         |                        1 |
-# |               0.5 |          0 |             16 | C/U*D = 4            | R/I * L + R/BW = 0.25     |                     0.75 |
-# |              0.75 |          0 |             16 |                      |                           |                          |
-# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------|
-##############################
-
-B=np.full((2,2),8)
-L=np.full((2,2),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("receiver")
-
-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}})
-
-s.run(breakpoints_every=1/2,breakpoint_callback=callback)
-- 
cgit v1.2.3