pyg90alarm 2.7.0__tar.gz → 2.7.1__tar.gz

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.7.0
+Version: 2.7.1
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov
@@ -224,7 +224,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       upstream_host=None
@@ -252,7 +252,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       # Upstream cloud server address the package should forward the

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/README.rst

@@ -177,7 +177,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       upstream_host=None
@@ -205,7 +205,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       # Upstream cloud server address the package should forward the

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/alarm.py

@@ -64,9 +64,9 @@ from .const import (
     REMOTE_PORT,
     REMOTE_TARGETED_DISCOVERY_PORT,
     LOCAL_TARGETED_DISCOVERY_PORT,
-    LOCAL_NOTIFICATIONS_HOST,
+    LOCAL_NOTIFICATIONS_IP,
     LOCAL_NOTIFICATIONS_PORT,
-    LOCAL_CLOUD_NOTIFICATIONS_HOST,
+    LOCAL_CLOUD_NOTIFICATIONS_IP,
     LOCAL_CLOUD_NOTIFICATIONS_PORT,
     REMOTE_CLOUD_PORT,
     DEVICE_REGISTRATION_TIMEOUT,
@@ -1379,7 +1379,7 @@ class G90Alarm(G90NotificationProtocol):
             await asyncio.sleep(interval)
 
     async def use_local_notifications(
-        self, notifications_local_host: str = LOCAL_NOTIFICATIONS_HOST,
+        self, notifications_local_ip: str = LOCAL_NOTIFICATIONS_IP,
         notifications_local_port: int = LOCAL_NOTIFICATIONS_PORT
     ) -> None:
         """
@@ -1391,16 +1391,16 @@ class G90Alarm(G90NotificationProtocol):
             protocol_factory=lambda: self,
             host=self._host,
             port=self._port,
-            local_host=notifications_local_host,
+            local_ip=notifications_local_ip,
             local_port=notifications_local_port
         )
 
     # pylint: disable=too-many-positional-arguments
     async def use_cloud_notifications(
         self,
-        cloud_host: str,
+        cloud_ip: str,
         cloud_port: int,
-        cloud_local_host: str = LOCAL_CLOUD_NOTIFICATIONS_HOST,
+        cloud_local_ip: str = LOCAL_CLOUD_NOTIFICATIONS_IP,
         cloud_local_port: int = LOCAL_CLOUD_NOTIFICATIONS_PORT,
         upstream_host: Optional[str] = None,
         upstream_port: Optional[int] = REMOTE_CLOUD_PORT,
@@ -1415,11 +1415,11 @@ class G90Alarm(G90NotificationProtocol):
         of that is configuring cloud server address on the panel is one-time
         operation, while the method will be called multiple times.
 
-        :param cloud_host: The cloud server host to connect to, should be
-         reachable from the panel
+        :param cloud_ip: The IP address of cloud server to connect to, should
+         be reachable from the panel
         :param cloud_port: The cloud server port to connect to, should be
          reachable from the panel
-        :param cloud_local_host: Local host to bind cloud notifications
+        :param cloud_local_ip: Local IP address to bind cloud notifications
          listener to
         :param cloud_local_port: Local port to bind cloud notifications
          listener to, should match `cloud_port` above unless network setup
@@ -1437,9 +1437,9 @@ class G90Alarm(G90NotificationProtocol):
             protocol_factory=lambda: self,
             upstream_host=upstream_host,
             upstream_port=upstream_port,
-            local_host=cloud_local_host,
+            local_ip=cloud_local_ip,
             local_port=cloud_local_port,
-            cloud_host=cloud_host,
+            cloud_ip=cloud_ip,
             cloud_port=cloud_port,
             keep_single_connection=keep_single_connection
         )

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/cloud/messages.py

@@ -226,7 +226,7 @@ class G90CloudHelloDiscoveryRespMessage(G90CloudMessage):
         _LOGGER.debug(
             "%s: Timestamp added: %s", type(self).__name__, str(self)
         )
-        self.ip_addr = context.cloud_host.encode()
+        self.ip_addr = context.cloud_ip.encode()
         self.port = context.cloud_port
 
     @property

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/cloud/notifications.py

@@ -61,7 +61,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
 
     :param protocol_factory: Factory function to create notification
      protocol handlers
-    :param local_host: Local host to bind the server to
+    :param cloud_ip: Cloud IP address to announce to the panel
+    :param cloud_port: Cloud port to announce to the panel
+    :param local_ip: Local IP to bind the server to
     :param local_port: Local port to bind the server to
     :param upstream_host: Optional upstream host to forward messages to
     :param upstream_port: Optional upstream port to forward messages to
@@ -73,8 +75,8 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
     def __init__(
         self,
         protocol_factory: Callable[[], G90NotificationProtocol],
-        local_host: str, local_port: int,
-        cloud_host: str, cloud_port: int,
+        local_ip: str, local_port: int,
+        cloud_ip: str, cloud_port: int,
         upstream_host: Optional[str] = None,
         upstream_port: Optional[int] = None,
         keep_single_connection: bool = True,
@@ -82,9 +84,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         super().__init__(protocol_factory)
         self._transport: Optional[Transport] = None
         self._server: Optional[asyncio.Server] = None
-        self._local_host = local_host
+        self._local_ip = local_ip
         self._local_port = local_port
-        self._cloud_host = cloud_host
+        self._cloud_ip = cloud_ip
         self._cloud_port = cloud_port
         self._upstream_host = upstream_host
         self._upstream_port = upstream_port
@@ -164,9 +166,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
                 # Instantiate a context for the messages
                 ctx = G90CloudMessageContext(
                     device_id=self.device_id,
-                    local_host=self._local_host,
+                    local_ip=self._local_ip,
                     local_port=self._local_port,
-                    cloud_host=self._cloud_host,
+                    cloud_ip=self._cloud_ip,
                     cloud_port=self._cloud_port,
                     upstream_host=self._upstream_host,
                     upstream_port=self._upstream_port,
@@ -373,11 +375,11 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         loop = asyncio.get_running_loop()
 
         _LOGGER.debug('Creating cloud endpoint for %s:%s',
-                      self._local_host,
+                      self._local_ip,
                       self._local_port)
         self._server = await loop.create_server(
             lambda: self,
-            self._local_host, self._local_port
+            self._local_ip, self._local_port
         )
 
     async def close(self) -> None:
@@ -406,7 +408,7 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         if self._server:
             _LOGGER.debug(
                 'No longer listening for cloud connections on %s:%s',
-                self._local_host, self._local_port
+                self._local_ip, self._local_port
             )
             self._server.close()
             self._server = None

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/cloud/protocol.py

@@ -73,11 +73,11 @@ class G90CloudMessageContext:  # pylint:disable=too-many-instance-attributes
     This class holds information about the local and remote hosts and ports,
     as well as the cloud server and upstream connection details.
     """
-    local_host: str
+    local_ip: str
     local_port: int
     remote_host: str
     remote_port: int
-    cloud_host: str
+    cloud_ip: str
     cloud_port: int
     upstream_host: Optional[str]
     upstream_port: Optional[int]

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/const.py

@@ -28,9 +28,9 @@ from typing import Optional
 REMOTE_PORT = 12368
 REMOTE_TARGETED_DISCOVERY_PORT = 12900
 LOCAL_TARGETED_DISCOVERY_PORT = 12901
-LOCAL_NOTIFICATIONS_HOST = '0.0.0.0'
+LOCAL_NOTIFICATIONS_IP = '0.0.0.0'
 LOCAL_NOTIFICATIONS_PORT = 12901
-LOCAL_CLOUD_NOTIFICATIONS_HOST = '0.0.0.0'
+LOCAL_CLOUD_NOTIFICATIONS_IP = '0.0.0.0'
 LOCAL_CLOUD_NOTIFICATIONS_PORT = 5678
 REMOTE_CLOUD_PORT = 5678
 DEVICE_REGISTRATION_TIMEOUT = 30

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm/local/notifications.py

@@ -52,19 +52,19 @@ class G90LocalNotifications(G90NotificationsBase, DatagramProtocol):
     :param host: The host on which the device is listening for notifications.
     :param local_port: The port on which the local host is listening for
      notifications.
-    :param local_host: The host on which the local host is listening for
+    :param local_ip: The IP address on which the local host is listening for
      notifications.
     """
     # pylint:disable=too-many-positional-arguments,too-many-arguments
     def __init__(
         self, protocol_factory: Callable[[], G90NotificationProtocol],
-        port: int, host: str, local_port: int, local_host: str,
+        port: int, host: str, local_port: int, local_ip: str,
     ):
         super().__init__(protocol_factory)
 
         self._host = host
         self._port = port
-        self._notifications_local_host = local_host
+        self._notifications_local_ip = local_ip
         self._notifications_local_port = local_port
 
     # Implementation of datagram protocol,
@@ -107,11 +107,11 @@ class G90LocalNotifications(G90NotificationsBase, DatagramProtocol):
         loop = asyncio.get_running_loop()
 
         _LOGGER.debug('Creating UDP endpoint for %s:%s',
-                      self._notifications_local_host,
+                      self._notifications_local_ip,
                       self._notifications_local_port)
         (self._transport,
          _protocol) = await loop.create_datagram_endpoint(
             lambda: self,
             local_addr=(
-                self._notifications_local_host, self._notifications_local_port
+                self._notifications_local_ip, self._notifications_local_port
             ))

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/src/pyg90alarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.7.0
+Version: 2.7.1
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov
@@ -224,7 +224,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       upstream_host=None
@@ -252,7 +252,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       # Upstream cloud server address the package should forward the

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/tests/device_mock.py

@@ -397,7 +397,7 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
     :param cloud_notification_data: List of TCP payloads to simulate being
      sent from cloud to the client, responses to requests from device
      typically
-    :param cloud_host: The host the simulated cloud endpoint listens on for
+    :param cloud_ip: The IP the simulated cloud endpoint listens on for
      client requests
     :param cloud_port: The port the simulated cloud endpoint listens on for
      client requests
@@ -417,7 +417,7 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
         cloud_upstream_data: Optional[List[bytes]] = None,
         device_host: str = '127.0.0.1',
         notification_host: str = '127.0.0.1',
-        cloud_host: str = '127.0.0.1',
+        cloud_ip: str = '127.0.0.1',
         cloud_port: int = 5678,
         cloud_upstream_host: str = '127.0.0.1',
         cloud_upstream_port: int = 5678,
@@ -436,7 +436,7 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
         ] = None
         self._cloud_data = cloud_notification_data or []
         self._cloud_recv_data: List[bytes] = []
-        self._cloud_host = cloud_host
+        self._cloud_ip = cloud_ip
         self._cloud_port = cloud_port
         self._cloud_upstream_data = cloud_upstream_data
         self._cloud_upstream_host = cloud_upstream_host
@@ -532,13 +532,13 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
         return self._notification_data
 
     @property
-    def cloud_host(self) -> str:
+    def cloud_ip(self) -> str:
         """
-        Returns the host the simulated cloud endpoint listens on.
+        Returns the IP address the simulated cloud endpoint listens on.
 
-        :return: Host name or address
+        :return: IP address
         """
-        return self._cloud_host
+        return self._cloud_ip
 
     @property
     def cloud_port(self) -> int:
@@ -683,7 +683,7 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
         if not self._cloud_notification_protocol:
             _LOGGER.debug(
                 'Creating TCP cloud client to %s:%s',
-                self._cloud_host,
+                self._cloud_ip,
                 self._cloud_port
             )
 
@@ -693,11 +693,11 @@ class DeviceMock:  # pylint:disable=too-many-instance-attributes
                 self._cloud_notification_protocol
             ) = await loop.create_connection(
                 lambda: MockCloudProtocol(self._cloud_data),
-                host=self._cloud_host, port=self._cloud_port
+                host=self._cloud_ip, port=self._cloud_port
             )
 
         self._cloud_notification_protocol.send_data(
-            (self._cloud_host, self._cloud_port)
+            (self._cloud_ip, self._cloud_port)
         )
         await asyncio.wait(
             [self._cloud_notification_protocol.is_done]

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/tests/test_alarm.py

@@ -237,7 +237,7 @@ async def test_sensor_callback(
         reset_occupancy_interval=reset_interval
     )
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
 
@@ -287,7 +287,7 @@ async def test_sensor_low_battery_callback(mock_device: DeviceMock) -> None:
     """
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
 
@@ -340,7 +340,7 @@ async def test_sensor_door_open_when_arming_callback(
     """
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
 
@@ -399,7 +399,7 @@ async def test_armdisarm_callback(mock_device: DeviceMock) -> None:
     armdisarm_cb.side_effect = lambda *args: future.set_result(True)
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.armdisarm_callback = armdisarm_cb
@@ -434,7 +434,7 @@ async def test_door_open_close_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.door_open_close_callback = door_open_close_cb
@@ -494,7 +494,7 @@ async def test_alarm_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     sensors = await g90.sensors
@@ -579,7 +579,7 @@ async def test_sensor_tamper_callback(
     """
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
 
@@ -645,7 +645,7 @@ async def test_sos_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.sos_callback = sos_cb
@@ -708,7 +708,7 @@ async def test_remote_button_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.sensor_callback = sensor_cb
@@ -748,7 +748,7 @@ async def test_rfid_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.sensor_callback = sensor_cb
@@ -789,7 +789,7 @@ async def test_rfid_low_battery_callback(mock_device: DeviceMock) -> None:
 
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.sensor_callback = sensor_cb
@@ -879,7 +879,7 @@ async def test_sms_alert_when_armed(mock_device: DeviceMock) -> None:
     armdisarm_cb.side_effect = lambda *args: future.set_result(True)
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.armdisarm_callback = armdisarm_cb
@@ -919,7 +919,7 @@ async def test_sms_alert_when_disarmed(mock_device: DeviceMock) -> None:
     armdisarm_cb.side_effect = lambda *args: future.set_result(True)
     g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     g90.armdisarm_callback = armdisarm_cb

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/tests/test_cloud_notifications.py

@@ -55,9 +55,9 @@ async def test_cloud_short_header(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     await notifications.listen()
@@ -77,9 +77,9 @@ async def test_cloud_short_packet(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = data_receive_awaitable(notifications)
@@ -102,9 +102,9 @@ async def test_cloud_ping(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = data_receive_awaitable(notifications)
@@ -135,9 +135,9 @@ async def test_cloud_hello(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = data_receive_awaitable(notifications)
@@ -172,9 +172,9 @@ async def test_cloud_hello_wrong_version(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = data_receive_awaitable(notifications)
@@ -202,9 +202,9 @@ async def test_cloud_hello_discovery(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
 
@@ -216,7 +216,7 @@ async def test_cloud_hello_discovery(
     await notifications.close()
     assert (
         b'\x01\xd0\x00\x10\x2c\x00\x00\x00\x01\x00\x00\x00'
-        + mock_device.cloud_host.encode()
+        + mock_device.cloud_ip.encode()
         + b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
         b'\x00\x00\x00\x00\x00'
         + pack('<i', mock_device.cloud_port)
@@ -245,9 +245,9 @@ async def test_cloud_notification(
     mock = MagicMock(spec=G90NotificationProtocol)
     notifications = G90CloudNotifications(
         protocol_factory=lambda: mock,
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = asyncio.get_running_loop().create_future()
@@ -289,9 +289,9 @@ async def test_cloud_status_change_disarm(
     mock = MagicMock(spec=G90NotificationProtocol)
     notifications = G90CloudNotifications(
         protocol_factory=lambda: mock,
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = asyncio.get_running_loop().create_future()
@@ -373,9 +373,9 @@ async def test_cloud_status_change_alarm_sensor(
     mock = MagicMock(spec=G90NotificationProtocol)
     notifications = G90CloudNotifications(
         protocol_factory=lambda: mock,
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = asyncio.get_running_loop().create_future()
@@ -416,9 +416,9 @@ async def test_cloud_status_change_sensor_activity(
     mock = MagicMock(spec=G90NotificationProtocol)
     notifications = G90CloudNotifications(
         protocol_factory=lambda: mock,
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = asyncio.get_running_loop().create_future()
@@ -449,9 +449,9 @@ async def test_cloud_command(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port
     )
     future = data_receive_awaitable(notifications)
@@ -506,9 +506,9 @@ async def test_upstream_cloud_hello(
     """
     notifications = G90CloudNotifications(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
-        cloud_host=mock_device.cloud_host,
+        cloud_ip=mock_device.cloud_ip,
         cloud_port=mock_device.cloud_port,
-        local_host=mock_device.cloud_host,
+        local_ip=mock_device.cloud_ip,
         local_port=mock_device.cloud_port,
         upstream_host=mock_device.cloud_upstream_host,
         upstream_port=mock_device.cloud_upstream_port

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/tests/test_local_notifications.py

@@ -31,7 +31,7 @@ async def test_device_notification_invalid_utf_data(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -60,7 +60,7 @@ async def test_device_notification_missing_header(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -93,7 +93,7 @@ async def test_device_notification_malformed_message(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -124,7 +124,7 @@ async def test_device_notification_missing_end_marker(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -151,7 +151,7 @@ async def test_wrong_device_notification_format(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -182,7 +182,7 @@ async def test_wrong_device_alert_format(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -215,7 +215,7 @@ async def test_unknown_device_notification(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -247,7 +247,7 @@ async def test_unknown_device_alert(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host=mock_device.host,
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -281,7 +281,7 @@ async def test_wrong_host(
         protocol_factory=lambda: MagicMock(spec=G90NotificationProtocol),
         host='1.2.3.4',
         port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -322,7 +322,7 @@ async def test_empty_device_guid(mock_device: DeviceMock) -> None:
         host=mock_device.host, port=mock_device.port
     )
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     # The command will fetch the host info and store the GIUD
@@ -346,7 +346,7 @@ async def test_wrong_device_guid(
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
     future = data_receive_awaitable(notifications)
@@ -378,7 +378,7 @@ async def test_sensor_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -411,7 +411,7 @@ async def test_armdisarm_notification_callback(
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -437,7 +437,7 @@ async def test_armdisarm_alert_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -463,7 +463,7 @@ async def test_door_open_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -489,7 +489,7 @@ async def test_door_close_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -517,7 +517,7 @@ async def test_doorbell_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -545,7 +545,7 @@ async def test_alarm_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -572,7 +572,7 @@ async def test_tamper_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -601,7 +601,7 @@ async def test_sos_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -637,7 +637,7 @@ async def test_low_battery_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 
@@ -663,7 +663,7 @@ async def test_door_open_when_arming_callback(mock_device: DeviceMock) -> None:
     notifications = G90LocalNotifications(
         protocol_factory=lambda: mock,
         host=mock_device.host, port=mock_device.port,
-        local_host=mock_device.notification_host,
+        local_ip=mock_device.notification_host,
         local_port=mock_device.notification_port
     )
 

{pyg90alarm-2.7.0 → pyg90alarm-2.7.1}/tests/test_sensor.py

@@ -491,7 +491,7 @@ async def test_sensor_register(
     # Setup the notifications, since those are required to complete the
     # registration process
     await g90.use_local_notifications(
-        notifications_local_host=mock_device.notification_host,
+        notifications_local_ip=mock_device.notification_host,
         notifications_local_port=mock_device.notification_port
     )
     await g90.listen_notifications()