Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f33b0a authored by Charlie Boutier's avatar Charlie Boutier Committed by Gerrit Code Review
Browse files

Merge "Pandora: Refactor Bumble service registration" into main

parents f444904a 1ffc4a4d

framework/tests/bumble/src/bumble_server.py

+10 −7
Original line number Diff line number Diff line
@@ -47,13 +47,7 @@ ROOTCANAL_PORT_CUTTLEFISH = 7300 
    help='Bumble json configuration file',

)

def main(grpc_port: int, rootcanal_port: int, transport: str, config: str) -> None:

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_AshaServicer_to_server(AshaService(bumble.device), server))

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_DckServicer_to_server(DckService(bumble.device), server))

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_GATTServicer_to_server(GATTService(bumble.device), server))



    register_bumble_services()

    if '<rootcanal-port>' in transport:

        transport = transport.replace('<rootcanal-port>', str(rootcanal_port))
@@ -70,6 +64,15 @@ def main(grpc_port: int, rootcanal_port: int, transport: str, config: str) -> No 
    asyncio.run(serve(device, config=server_config, port=grpc_port))





def register_bumble_services():

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_AshaServicer_to_server(AshaService(bumble.device), server))

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_DckServicer_to_server(DckService(bumble.device), server))

    bumble_server.register_servicer_hook(

        lambda bumble, _, server: add_GATTServicer_to_server(GATTService(bumble.device), server))





def retrieve_config(config: str) -> Dict[str, Any]:

    if not config:

        return {}