contrib/labgrid-webapp: migrate to gRPC

Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

contrib/README.rst

@@ -13,14 +13,14 @@ Quick Start
    $ source venv/bin/activate
    venv $ pip install -r contrib/requirements-webapp.txt
    venv $ ./contrib/labgrid-webapp --help
-   usage: labgrid-webapp [-h] [--crossbar URL] [--port PORT] [--proxy PROXY]
+   usage: labgrid-webapp [-h] [--coordinator ADDRESS] [--port PORT] [--proxy PROXY]
 
    Labgrid webapp
 
    options:
      -h, --help            show this help message and exit
-     --crossbar URL, -x URL
-                           Crossbar websocket URL (default: ws://127.0.0.1:20408/ws)
+     --coordinator ADDRESS, -x ADDRESS
+                           Coordinator address as HOST[:PORT] (default: 127.0.0.1:20408)
      --port PORT           Port to serve on
      --proxy PROXY, -P PROXY
 

contrib/labgrid-webapp

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import argparse
+import asyncio
 import logging
 import os
 import sys
@@ -118,11 +119,11 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     parser.add_argument(
-        '--crossbar',
+        '--coordinator',
         '-x',
         metavar='URL',
-        default=os.environ.get('LG_CROSSBAR', 'ws://127.0.0.1:20408/ws'),
-        help='Crossbar websocket URL (default: %(default)s)',
+        default=os.environ.get('LG_COORDINATOR', '127.0.0.1:20408'),
+        help='Coordinator address as HOST[:PORT] (default: %(default)s)',
     )
     parser.add_argument('--port', type=int, default=8800, help='Port to serve on')
     parser.add_argument('--proxy', '-P', help='Proxy connections via given ssh host')
@@ -132,16 +133,20 @@ def main():
     if args.proxy:
         proxymanager.force_proxy(args.proxy)
 
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
     try:
         session = start_session(
-            args.crossbar, os.environ.get('LG_CROSSBAR_REALM', 'realm1'), {},
+            args.coordinator,
+            loop=loop,
         )
     except ConnectionRefusedError:
-        logger.fatal('Unable to connect to labgrid crossbar')
+        logger.fatal('Unable to connect to labgrid coordinator')
         return
 
     server = uvicorn.Server(config=uvicorn.Config(
-        loop=session.loop,
+        loop=loop,
         host='0.0.0.0',
         port=args.port,
         app=app,
@@ -153,7 +158,11 @@ def main():
         if route.path not in reserved_routes:
             logger.info(f'  - {route.path}')
 
-    session.loop.run_until_complete(server.serve())
+    try:
+        loop.run_until_complete(server.serve())
+    finally:
+        loop.run_until_complete(session.stop())
+        loop.run_until_complete(session.close())
 
 
 if __name__ == '__main__':