From c02cfd04253c5f5c839410d418789884b9bfb13a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 16 Mar 2021 22:09:07 +0100 Subject: Adapt gateway selector to check for nearest gateway within a city. Also optionally parse sortedGateways json object from menshen backend reponse --- app/src/test/resources/v4/riseup_geoip_v4.json | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 app/src/test/resources/v4/riseup_geoip_v4.json (limited to 'app/src/test/resources/v4/riseup_geoip_v4.json') diff --git a/app/src/test/resources/v4/riseup_geoip_v4.json b/app/src/test/resources/v4/riseup_geoip_v4.json new file mode 100644 index 00000000..439d6ffb --- /dev/null +++ b/app/src/test/resources/v4/riseup_geoip_v4.json @@ -0,0 +1,35 @@ +{ + "ip":"51.158.144.32", + "cc":"FR", + "city":"Paris", + "lat":48.8628, + "lon":2.3292, + "gateways":[ + "mouette.riseup.net", + "hoatzin.riseup.net", + "zarapito.riseup.net", + "redshank.riseup.net" + ], + "sortedGateways": [ + { + "host": "mouette.riseup.net", + "fullness": 0.3, + "overload": false + }, + { + "host": "hoatzin.riseup.net", + "fullness": 0.36, + "overload": false + }, + { + "host": "zarapito.riseup.net", + "fullness": 0.57, + "overload": false + }, + { + "host": "zarapito.riseup.net", + "fullness": 0.92, + "overload": true + } + ] +} \ No newline at end of file -- cgit v1.2.3 From 1d2e09736a0526c574fe4c541d2f83c1ef44ccc0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 20 Mar 2021 16:57:31 +0100 Subject: write tests for city based gateway selection --- app/src/test/resources/v4/riseup_geoip_v4.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/src/test/resources/v4/riseup_geoip_v4.json') diff --git a/app/src/test/resources/v4/riseup_geoip_v4.json b/app/src/test/resources/v4/riseup_geoip_v4.json index 439d6ffb..c95a9e6d 100644 --- a/app/src/test/resources/v4/riseup_geoip_v4.json +++ b/app/src/test/resources/v4/riseup_geoip_v4.json @@ -7,8 +7,9 @@ "gateways":[ "mouette.riseup.net", "hoatzin.riseup.net", - "zarapito.riseup.net", - "redshank.riseup.net" + "yal.riseup.net", + "redshank.riseup.net", + "zarapito.riseup.net" ], "sortedGateways": [ { @@ -22,8 +23,13 @@ "overload": false }, { - "host": "zarapito.riseup.net", - "fullness": 0.57, + "host": "yal.riseup.net", + "fullness": 0.59, + "overload": false + }, + { + "host": "redshank.riseup.net", + "fullness": 0.8, "overload": false }, { -- cgit v1.2.3