rename websocketgateway to websocketservergateway

Author: dmulcahey

tests/conftest.py

@@ -24,7 +24,7 @@
 import zigpy.zdo.types as zdo_t
 
 from zha.application import Platform
-from zha.application.gateway import Gateway, WebSocketGateway
+from zha.application.gateway import Gateway, WebSocketServerGateway
 from zha.application.helpers import (
     AlarmControlPanelOptions,
     CoordinatorConfiguration,
@@ -326,7 +326,7 @@ async def connected_client_and_server(
     zha_data: ZHAData,
     zigpy_app_controller: ControllerApplication,
     caplog: pytest.LogCaptureFixture,  # pylint: disable=unused-argument
-) -> AsyncGenerator[tuple[Controller, WebSocketGateway], None]:
+) -> AsyncGenerator[tuple[Controller, WebSocketServerGateway], None]:
     """Return the connected client and server fixture."""
 
     with (
@@ -339,7 +339,7 @@ async def connected_client_and_server(
             return_value=zigpy_app_controller,
         ),
     ):
-        ws_gateway = await WebSocketGateway.async_from_config(zha_data)
+        ws_gateway = await WebSocketServerGateway.async_from_config(zha_data)
         await ws_gateway.async_initialize()
         await ws_gateway.async_block_till_done()
         await ws_gateway.async_initialize_devices_and_entities()

tests/websocket/test_alarm_control_panel.py

@@ -9,7 +9,7 @@
 import zigpy.zcl.foundation as zcl_f
 
 from zha.application import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import AlarmControlPanelEntity
 from zha.websocket.client.controller import Controller
 from zha.websocket.client.proxy import DeviceProxy

tests/websocket/test_binary_sensor.py

@@ -8,7 +8,7 @@
 from zigpy.zcl.clusters import general, measurement, security
 
 from zha.application.discovery import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import BasePlatformEntity, BinarySensorEntity
 from zha.websocket.client.controller import Controller
 from zha.websocket.client.proxy import DeviceProxy

tests/websocket/test_button.py

@@ -9,7 +9,7 @@
 import zigpy.zcl.foundation as zcl_f
 
 from zha.application.discovery import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import BasePlatformEntity, ButtonEntity
 from zha.websocket.client.controller import Controller
 from zha.websocket.client.proxy import DeviceProxy

tests/websocket/test_client_controller.py

@@ -16,7 +16,7 @@
     DevicePairingStatus,
     RawDeviceInitializedDeviceInfo,
     RawDeviceInitializedEvent,
-    WebSocketGateway as Server,
+    WebSocketServerGateway as Server,
 )
 from zha.application.model import DeviceJoinedEvent, DeviceLeftEvent
 from zha.application.platforms.model import (
@@ -117,7 +117,7 @@ async def device_switch_2(
 ) -> Device:
     """Test zha switch platform."""
 
-    controller, server = connected_client_and_server
+    _, server = connected_client_and_server
     zigpy_device = create_mock_zigpy_device(
         server,
         {

tests/websocket/test_number.py

@@ -8,7 +8,7 @@
 from zigpy.zcl.clusters import general
 
 from zha.application.discovery import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import BasePlatformEntity, NumberEntity
 from zha.websocket.client.controller import Controller
 from zha.websocket.client.proxy import DeviceProxy

tests/websocket/test_siren.py

@@ -11,7 +11,7 @@
 import zigpy.zcl.foundation as zcl_f
 
 from zha.application.discovery import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import BasePlatformEntity
 from zha.websocket.client.controller import Controller
 from zha.websocket.client.proxy import DeviceProxy

tests/websocket/test_switch.py

@@ -14,7 +14,7 @@
 
 from tests.common import mock_coro
 from zha.application.discovery import Platform
-from zha.application.gateway import WebSocketGateway as Server
+from zha.application.gateway import WebSocketServerGateway as Server
 from zha.application.platforms.model import (
     BasePlatformEntity,
     SwitchEntity,
@@ -65,7 +65,7 @@ def get_group_entity(
 @pytest.fixture
 def zigpy_device(connected_client_and_server: tuple[Controller, Server]) -> ZigpyDevice:
     """Device tracker zigpy device."""
-    controller, server = connected_client_and_server
+    _, server = connected_client_and_server
     zigpy_device = create_mock_zigpy_device(
         server,
         {

tests/websocket/test_websocket_server_client.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from zha.application.gateway import WebSocketGateway
+from zha.application.gateway import WebSocketServerGateway
 from zha.application.helpers import ZHAData
 from zha.websocket.client.client import Client
 from zha.websocket.client.controller import Controller
@@ -14,7 +14,7 @@ async def test_server_client_connect_disconnect(
 ) -> None:
     """Tests basic connect/disconnect logic."""
 
-    async with WebSocketGateway(zha_data) as gateway:
+    async with WebSocketServerGateway(zha_data) as gateway:
         assert gateway.is_serving
         assert gateway._ws_server is not None
 
@@ -37,17 +37,17 @@ async def test_server_client_connect_disconnect(
 
 
 async def test_client_message_id_uniqueness(
-    connected_client_and_server: tuple[Controller, WebSocketGateway],
+    connected_client_and_server: tuple[Controller, WebSocketServerGateway],
 ) -> None:
     """Tests that client message IDs are unique."""
-    controller, gateway = connected_client_and_server
+    controller, _ = connected_client_and_server
 
     ids = [controller.client.new_message_id() for _ in range(1000)]
     assert len(ids) == len(set(ids))
 
 
 async def test_client_stop_server(
-    connected_client_and_server: tuple[Controller, WebSocketGateway],
+    connected_client_and_server: tuple[Controller, WebSocketServerGateway],
 ) -> None:
     """Tests that the client can stop the server."""
     controller, gateway = connected_client_and_server

zha/application/gateway.py

@@ -718,7 +718,7 @@ def handle_message(  # pylint: disable=unused-argument
             self.async_update_device(sender, available=True)
 
 
-class WebSocketGateway(Gateway):
+class WebSocketServerGateway(Gateway):
     """ZHAWSS server implementation."""
 
     def __init__(self, config: ZHAData) -> None:
@@ -835,7 +835,7 @@ async def async_block_till_done(self, wait_background_tasks=False):
                 await asyncio.sleep(0.001)
         await super().async_block_till_done(wait_background_tasks=wait_background_tasks)
 
-    async def __aenter__(self) -> WebSocketGateway:
+    async def __aenter__(self) -> WebSocketServerGateway:
         """Enter the context manager."""
         await self.start_server()
         return self