Implement reset_network_info

Author: puddly

tests/application/test_startup.py

@@ -10,6 +10,7 @@
 from zigpy_znp.types.nvids import ExNvIds, OsalNvIds
 
 from ..conftest import (
+    ALL_DEVICES,
     EMPTY_DEVICES,
     FORMED_DEVICES,
     CoroutineMock,
@@ -270,7 +271,7 @@ async def test_zstack_build_id_empty(device, make_application, mocker):
 
 
 @pytest.mark.parametrize("device", [FormedLaunchpadCC26X2R1])
-async def test_deprecated_concurrency_config(device, make_application, mocker):
+async def test_deprecated_concurrency_config(device, make_application):
     with pytest.raises(vol.MultipleInvalid) as exc:
         app, znp_server = await make_application(
             server_cls=device,
@@ -282,3 +283,13 @@ async def test_deprecated_concurrency_config(device, make_application, mocker):
         )
 
     assert "max_concurrent_requests" in str(exc.value)
+
+
+@pytest.mark.parametrize("device", ALL_DEVICES)
+async def test_reset_network_info(device, make_application):
+    app, znp_server = await make_application(server_cls=device)
+    await app.connect()
+    await app.reset_network_info()
+
+    with pytest.raises(NetworkNotFormed):
+        await app.start_network()

zigpy_znp/api.py

@@ -310,18 +310,11 @@ async def start_network(self):
 
             await asyncio.sleep(1)
 
-    async def write_network_info(
-        self,
-        *,
-        network_info: zigpy.state.NetworkInfo,
-        node_info: zigpy.state.NodeInfo,
-    ) -> None:
+    async def reset_network_info(self):
         """
-        Writes network and node state to NVRAM.
+        Resets node network information and leaves the current network.
         """
 
-        from zigpy_znp.znp import security
-
         # Delete any existing NV items that store formation state
         await self.nvram.osal_delete(OsalNvIds.HAS_CONFIGURED_ZSTACK1)
         await self.nvram.osal_delete(OsalNvIds.HAS_CONFIGURED_ZSTACK3)
@@ -336,6 +329,19 @@ async def write_network_info(
 
         await self.reset()
 
+    async def write_network_info(
+        self,
+        *,
+        network_info: zigpy.state.NetworkInfo,
+        node_info: zigpy.state.NodeInfo,
+    ) -> None:
+        """
+        Writes network and node state to NVRAM.
+        """
+        from zigpy_znp.znp import security
+
+        await self.reset_network_info()
+
         # Form a network with completely random settings to get NVRAM to a known state
         for item, value in {
             OsalNvIds.PANID: t.uint16_t(0xFFFF),

zigpy_znp/zigbee/application.py

@@ -161,6 +161,13 @@ async def load_network_info(self, *, load_devices=False) -> None:
         self.state.node_info = self._znp.node_info
         self.state.network_info = self._znp.network_info
 
+    async def reset_network_info(self) -> None:
+        """
+        Resets node network information and leaves the current network.
+        """
+
+        await self._znp.reset_network_info()
+
     async def write_network_info(
         self,
         *,