From 3b4419e4e6c9470a218c373ef96b6635539f64e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Sun, 21 Jun 2020 11:52:15 +0200 Subject: [PATCH] Fix simulator.py --- docker/edge/docker-compose.modules.yml | 4 ++-- docker/simulator/device_simulator.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/edge/docker-compose.modules.yml b/docker/edge/docker-compose.modules.yml index 3a744f9..13238e0 100644 --- a/docker/edge/docker-compose.modules.yml +++ b/docker/edge/docker-compose.modules.yml @@ -26,10 +26,10 @@ services: environment: IOT_HTTP: "http://ingress" IOT_MQTT: "ingress:80" - # IOT_SERIAL: "websockets1234" + # IOT_SERIAL: "ws" # IOT_DELAY: 10 IOT_DEBUG: 1 - command: ["/opt/bite/device_simulator.py", "-t", "websockets"] + command: ["/opt/bite/device_simulator.py", "-t", "ws"] network_mode: "host" device-mqtt: diff --git a/docker/simulator/device_simulator.py b/docker/simulator/device_simulator.py index b4eb239..2c3c20d 100755 --- a/docker/simulator/device_simulator.py +++ b/docker/simulator/device_simulator.py @@ -52,7 +52,7 @@ def publish_json(transport, endpoint, data): hostname=endpoint.split(':')[0], port=int(endpoint.split(':')[1]), client_id=serial, - transport=transport, + transport=('websockets' if transport == 'ws' else 'tcp'), # auth=auth FIXME ) @@ -70,7 +70,7 @@ def main(): '127.0.0.1:1883'), help='IoT MQTT endpoint') parser.add_argument('-t', '--transport', - choices=['mqtt', 'websockets', 'http'], + choices=['mqtt', 'ws', 'http'], default=os.environ.get('IOT_TL', 'http'), help='IoT transport layer') parser.add_argument('-s', '--serial', @@ -104,7 +104,7 @@ def main(): } if args.transport == 'http': post_json(args.endpoint, telemetry, {**data, 'payload': payload}) - elif args.transport in ('mqtt', 'websockets'): + elif args.transport in ('mqtt', 'ws'): publish_json( args.transport, args.mqtt, {**data, 'payload': payload}) else: