From 6caf1f365eb23255e50e6573136cb32ed9eca8f4 Mon Sep 17 00:00:00 2001
From: Nixellion <nixesvfx@gmail.com>
Date: Sat, 11 Jul 2020 21:05:22 +0300
Subject: [PATCH] test

---
 config/config.yaml |  4 +++-
 requirements.txt   |  4 +++-
 speedtester.py     | 19 +++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index d8cd319..45ad275 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -15,7 +15,9 @@ ros_minimum_speed: 100000
 # starts to show high CPU usage at close to 20mbit.
 # Not implemented yet
 ros_maximum_speed: 15000000 # 15 mbit
-ros_wan_interface: lte1
+ros_wan_interface:
+  - eth_LTE6_1
+  - eth_LTE_0
 api_host: 0.0.0.0
 api_port: 1357
 bad_speed_mbps: 0.2
diff --git a/requirements.txt b/requirements.txt
index dfd053e..15a92de 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,6 @@ peewee
 speedtest-cli
 numpy
 matplotlib
-RouterOS-api
\ No newline at end of file
+RouterOS-api
+flask
+flask-socketio
\ No newline at end of file
diff --git a/speedtester.py b/speedtester.py
index 70a526a..1d092af 100644
--- a/speedtester.py
+++ b/speedtester.py
@@ -262,19 +262,22 @@ def threaded_wan_speed():
                                                   password=secrets["ros_password"], plaintext_login=True)
         api = connection.get_api()
 
-        traffic = api.get_resource('/').call('interface/monitor-traffic',
-                                             {'interface': config['ros_wan_interface'], 'once': ' '})[0]
+        rx = 0
+        tx = 0
+        for interface in config['ros_wan_interface']:
+            traffic = api.get_resource('/').call('interface/monitor-traffic',
+                                                 {'interface': interface, 'once': ' '})[0]
 
-        traffic['rx-bits-per-second'] = int(traffic['rx-bits-per-second'])
-        traffic['tx-bits-per-second'] = int(traffic['tx-bits-per-second'])
+            rx += int(traffic['rx-bits-per-second'])
+            tx += int(traffic['tx-bits-per-second'])
 
         if downloading:
-            downloads.append(traffic['rx-bits-per-second'])
-            print(f"DL: {mbits(traffic['rx-bits-per-second'])} mbps;")
+            downloads.append(rx)
+            print(f"DL: {mbits(rx)} mbps;")
         else:
             if upload_warmed_up:
-                uploads.append(traffic['tx-bits-per-second'])
-                print(f"UP: {mbits(traffic['tx-bits-per-second'])} mbps;")
+                uploads.append(tx)
+                print(f"UP: {mbits(tx)} mbps;")
             else:
                 print("Upload warm-up...")
                 time.sleep(2)