From c58739705f2f7d20914d6831c512b0b465041424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Tue, 7 Mar 2017 21:41:22 +0100 Subject: [PATCH 1/6] Added telnet parser and test Added TelnetClient Change encoding, added connect() and disconnect() Bugfixes --- ogn/client/client.py | 34 ++++++++++++++++++++++++++++++- ogn/client/settings.py | 3 +++ tests/client/test_TelnetClient.py | 14 +++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 tests/client/test_TelnetClient.py diff --git a/ogn/client/client.py b/ogn/client/client.py index 63dc253..aa920c4 100644 --- a/ogn/client/client.py +++ b/ogn/client/client.py @@ -1,6 +1,6 @@ import socket import logging -from time import time +from time import time, sleep from ogn.client import settings @@ -83,3 +83,35 @@ class AprsClient: self.connect() else: return + + +class TelnetClient: + def __init__(self): + self.logger = logging.getLogger(__name__) + self.logger.info("Connect to local telnet server") + + def connect(self): + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.connect((settings.TELNET_SERVER_HOST, settings.TELNET_SERVER_PORT)) + + def run(self, callback, autoreconnect=False): + while True: + try: + self.sock_file = self.sock.makefile(mode='rw', encoding='iso-8859-1') + while True: + packet_str = self.sock_file.readline().strip() + callback(packet_str) + + except ConnectionRefusedError: + self.logger.error('Telnet server not running', exc_info=True) + + if autoreconnect: + sleep(1) + self.connect() + else: + return + + def disconnect(self): + self.logger.info('Disconnect') + self.sock.shutdown(0) + self.sock.close() diff --git a/ogn/client/settings.py b/ogn/client/settings.py index 220cfea..8db8ecc 100644 --- a/ogn/client/settings.py +++ b/ogn/client/settings.py @@ -8,3 +8,6 @@ PACKAGE_VERSION = '0.8.2' APRS_APP_VER = PACKAGE_VERSION[:3] APRS_KEEPALIVE_TIME = 240 + +TELNET_SERVER_HOST = 'localhost' +TELNET_SERVER_PORT = 50001 diff --git a/tests/client/test_TelnetClient.py b/tests/client/test_TelnetClient.py new file mode 100644 index 0000000..5d8eb9c --- /dev/null +++ b/tests/client/test_TelnetClient.py @@ -0,0 +1,14 @@ +import unittest +import unittest.mock as mock + +from ogn.client.client import TelnetClient + + +class TelnetClientTest(unittest.TestCase): + @mock.patch('ogn.client.client.socket') + def test_connect(self, socket_mock): + def callback(raw_message): + pass + + client = TelnetClient() + client.run(callback=callback) From bc3e31838fd1b5eec3c4ca17f5fab4588ac87904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Mon, 3 Apr 2017 08:08:03 +0200 Subject: [PATCH 2/6] Update to receiver version 0.2.6 Update to receiver version 0.2.6 Better testing --- tests/client/test_TelnetClient.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/client/test_TelnetClient.py b/tests/client/test_TelnetClient.py index 5d8eb9c..c26a19f 100644 --- a/tests/client/test_TelnetClient.py +++ b/tests/client/test_TelnetClient.py @@ -6,9 +6,21 @@ from ogn.client.client import TelnetClient class TelnetClientTest(unittest.TestCase): @mock.patch('ogn.client.client.socket') - def test_connect(self, socket_mock): + def test_connect_disconnect(self, socket_mock): + client = TelnetClient() + client.connect() + client.sock.connect.assert_called_once() + + client.disconnect() + client.sock.shutdown.assert_called_once() + client.sock.close.assert_called_once() + + @mock.patch('ogn.client.client.socket') + def test_run(self, socket_mock): def callback(raw_message): - pass + raise ConnectionRefusedError client = TelnetClient() + client.connect() + client.run(callback=callback) From 22d545c86cd4831cc036c8a11d7f430a4d100544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Wed, 5 Apr 2017 19:17:04 +0200 Subject: [PATCH 3/6] Added TelnetParser to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3939771..ed59085 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - parser: Added support for ddhhmm time format (eg. '312359z') - parser: Added support for heared aircrafts - client: Allow client to do sequential connect-disconnect +- parser: Added parser for local receiver output (port 50001) ## 0.7.1 - 2017-06-05 - parser: Bugfix, error_count in aircraft beacon is a int From a8d090119213186d75f6a9996b68cae4beba8dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sat, 10 Mar 2018 10:37:58 +0100 Subject: [PATCH 4/6] Test telnet parser --- ogn/parser/telnet_parser.py | 35 +++++++++++++++++++++++ tests/parser/test_parse_telnet.py | 47 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 ogn/parser/telnet_parser.py create mode 100644 tests/parser/test_parse_telnet.py diff --git a/ogn/parser/telnet_parser.py b/ogn/parser/telnet_parser.py new file mode 100644 index 0000000..3924c03 --- /dev/null +++ b/ogn/parser/telnet_parser.py @@ -0,0 +1,35 @@ +from datetime import datetime + +from ogn.parser import ParseError +from ogn.parser.utils import createTimestamp + + +def parse(telnet_data): + now = datetime.utcnow() + reference_date = now.date() + reference_time = now.time() + + try: + return {'pps_offset': float(telnet_data[0:5]), + 'frequency': float(telnet_data[9:16]), + 'aircraft_type': int(telnet_data[20:24]), + 'address_type': int(telnet_data[25]), + 'address': telnet_data[27:33], + 'timestamp': createTimestamp(telnet_data[34:40] + 'h', reference_date, reference_time), + 'latitude': float(telnet_data[43:53]), + 'longitude': float(telnet_data[54:64]), + 'altitude': int(telnet_data[68:73]), + 'climb_rate': float(telnet_data[74:80]), + 'ground_speed': float(telnet_data[83:89]), + 'track': float(telnet_data[92:98]), + 'turn_rate': float(telnet_data[101:107]), + 'magic_number': int(telnet_data[114:116]), + 'gps_status': telnet_data[117:122], + 'frequency_offset': float(telnet_data[123:129]), + 'signal_quality': float(telnet_data[132:137]), + 'error_count': float(telnet_data[139:142]), + 'distance': float(telnet_data[143:150]), + 'bearing': float(telnet_data[152:158]), + 'phi': float(telnet_data[161:167])} + except: + raise ParseError diff --git a/tests/parser/test_parse_telnet.py b/tests/parser/test_parse_telnet.py new file mode 100644 index 0000000..8e8ebb9 --- /dev/null +++ b/tests/parser/test_parse_telnet.py @@ -0,0 +1,47 @@ +import unittest +import unittest.mock as mock + +from datetime import datetime + +from ogn.parser.telnet_parser import parse +from ogn.parser.exceptions import ParseError + + +class TestStringMethods(unittest.TestCase): + @unittest.skip("Not yet implemented") + def test_telnet_fail_corrupt(self): + with self.assertRaises(ParseError): + parse('This is rubbish') + + @mock.patch('ogn.parser.telnet_parser.datetime') + def test_telnet_parse(self, datetime_mock): + # set the utcnow-mock near to the time in the test string + datetime_mock.utcnow.return_value = datetime(2015, 1, 1, 10, 0, 55) + + message = parse('0.867sec:868.398MHz: 1:2:DD9AB2 100050: [ +47.44356, +11.77856]deg 2749m +3.2m/s 34.5m/s 082.7deg -0.7deg/sec 5 03x03m -1.6kHz 8.5dB 1e 50.6km 151.4deg +1.9deg') + + self.assertEqual(message['pps_offset'], 0.867) + self.assertEqual(message['frequency'], 868.398) + self.assertEqual(message['aircraft_type'], 1) + self.assertEqual(message['address_type'], 2) + self.assertEqual(message['address'], 'DD9AB2') + self.assertEqual(message['timestamp'], datetime(2015, 1, 1, 10, 0, 50)) + self.assertEqual(message['latitude'], 47.44356) + self.assertEqual(message['longitude'], 11.77856) + self.assertEqual(message['altitude'], 2749) + self.assertEqual(message['climb_rate'], 3.2) + self.assertEqual(message['ground_speed'], 34.5) + self.assertEqual(message['track'], 82.7) + self.assertEqual(message['turn_rate'], -0.7) + self.assertEqual(message['magic_number'], 5) # the '5' is a magic number... 1 if ground_speed is 0.0m/s an 3 or 5 if airborne. Do you have an idea what it is? + self.assertEqual(message['gps_status'], '03x03') + self.assertEqual(message['frequency_offset'], -1.6) + self.assertEqual(message['signal_quality'], 8.5) + self.assertEqual(message['error_count'], 1) + self.assertEqual(message['distance'], 50.6) + self.assertEqual(message['bearing'], 151.4) + self.assertEqual(message['phi'], 1.9) + + +if __name__ == '__main__': + unittest.main() From 74bd6d7b34de7f7f0b89aee428c9e1ce81047bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Tue, 10 Apr 2018 22:37:29 +0200 Subject: [PATCH 5/6] Fixed test --- tests/client/test_TelnetClient.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/client/test_TelnetClient.py b/tests/client/test_TelnetClient.py index c26a19f..3e39d76 100644 --- a/tests/client/test_TelnetClient.py +++ b/tests/client/test_TelnetClient.py @@ -9,11 +9,11 @@ class TelnetClientTest(unittest.TestCase): def test_connect_disconnect(self, socket_mock): client = TelnetClient() client.connect() - client.sock.connect.assert_called_once() + client.sock.connect.assert_called_once_with(('localhost', 50001)) client.disconnect() - client.sock.shutdown.assert_called_once() - client.sock.close.assert_called_once() + client.sock.shutdown.assert_called_once_with(0) + client.sock.close.assert_called_once_with() @mock.patch('ogn.client.client.socket') def test_run(self, socket_mock): From 4acde4b387356fdb8d2de39e67c1d0df670f15a4 Mon Sep 17 00:00:00 2001 From: Meisterschueler Date: Tue, 10 Apr 2018 22:54:57 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md Moved parser for 50001 to "unreleased" --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed59085..fd3d301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ## Unreleased - parser: Added support for OGNLT24 (LT24), OGSKYL (Skylines), OGSPID (Spider) and OGSPOT (Spot) +- parser: Added parser for local receiver output (port 50001) ## 0.8.2: - 2018-01-20 - parser: Better validation of timestamp, lat/lon and altitude @@ -16,7 +17,6 @@ - parser: Added support for ddhhmm time format (eg. '312359z') - parser: Added support for heared aircrafts - client: Allow client to do sequential connect-disconnect -- parser: Added parser for local receiver output (port 50001) ## 0.7.1 - 2017-06-05 - parser: Bugfix, error_count in aircraft beacon is a int