pyg90alarm 2.5.2__tar.gz → 2.5.3__tar.gz

{pyg90alarm-2.5.2 → pyg90alarm-2.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.5.2
+Version: 2.5.3
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov

{pyg90alarm-2.5.2 → pyg90alarm-2.5.3}/src/pyg90alarm/local/net_config.py

@@ -132,8 +132,22 @@ class G90NetConfig(DataclassLoadSave):
     def apn_auth(self) -> G90APNAuth:
         """
         Returns the APN authentication method as an enum.
+
+        Some panels might send values outside of the defined enum range,
+        presumably when SIM card is absent. In such cases, returns
+        `G90APNAuth.NONE`.
+
+        No attempt is made to correct the invalid value in the underlying
+        data field, since the panel is trusted - unless the value is modified
+        and saved back to the device.
+
+        :return: APN authentication method, or G90APNAuth.NONE if the received
+         value is invalid.
         """
-        return G90APNAuth(self._apn_auth)
+        try:
+            return G90APNAuth(self._apn_auth)
+        except ValueError:
+            return G90APNAuth.NONE
 
     @apn_auth.setter
     def apn_auth(self, value: G90APNAuth) -> None:

{pyg90alarm-2.5.2 → pyg90alarm-2.5.3}/src/pyg90alarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.5.2
+Version: 2.5.3
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov

{pyg90alarm-2.5.2 → pyg90alarm-2.5.3}/tests/test_net_config.py

@@ -190,3 +190,58 @@ async def test_net_config_apn_name_empty(
         b'[0,"123456789",1,1,"","user","pwd",3]'
         b']]IEND\0'
     ]
+
+
+@pytest.mark.parametrize('new_apn_auth_value,expected_recv_data', [
+    # Verify the invalid value is retained, since the panel is trusted, if no
+    # modifications to the value is made
+    pytest.param(
+        None, [
+            b'ISTART[212,212,""]IEND\0',
+            b'ISTART[213,213,[213,'
+            b'[0,"123456789",1,1,"","user","pwd",333]'
+            b']]IEND\0'
+        ], id='Device with invalid APN auth value unmodified'
+    ),
+    # Verify the invalid value is replaced with valid one when modified
+    pytest.param(
+        G90APNAuth.PAP, [
+            b'ISTART[212,212,""]IEND\0',
+            b'ISTART[213,213,[213,'
+            b'[0,"123456789",1,1,"","user","pwd",1]'
+            b']]IEND\0'
+        ], id='Device with invalid APN auth value modified to valid value'
+    ),
+])
+@pytest.mark.g90device(sent_data=[
+    b'ISTART[212,'
+    b'[0,"123456789",1,1,"","user","pwd",333,"54321"]'
+    b']IEND\0',
+    b'ISTARTIEND\0'
+])
+async def test_net_config_apn_auth_invalid(
+    new_apn_auth_value: Optional[G90APNAuth],
+    expected_recv_data: list[bytes],
+    mock_device: DeviceMock
+) -> None:
+    """
+    Tests for handling network configuration with invalid APN authentication
+    method value.
+    """
+    g90 = G90Alarm(host=mock_device.host, port=mock_device.port)
+
+    # Retrieve configuration
+    cfg = await g90.net_config()
+    assert isinstance(cfg, G90NetConfig)
+
+    # Verify retrieved value is mapped to NONE enum value
+    assert cfg.apn_auth == G90APNAuth.NONE
+
+    # Modify the value if requested
+    if new_apn_auth_value is not None:
+        cfg.apn_auth = new_apn_auth_value
+    # Save the configuration
+    await cfg.save()
+
+    # Verify data sent to the device
+    assert await mock_device.recv_data == expected_recv_data