Write network settings directly to NVRAM

Author: puddly

tests/conftest.py

@@ -393,15 +393,7 @@ def connection_lost(self, exc):
 
         return super().connection_lost(exc)
 
-    def _startup(self):
-        startup_option = self.nvram_deserialize(
-            self._nvram[ExNvIds.LEGACY].get(OsalNvIds.STARTUP_OPTION, b"\x00"),
-            t.StartupOptions,
-        )
-
-        if not startup_option & t.StartupOptions.ClearState:
-            return
-
+    def _create_network_nvram(self):
         self.nib = self._default_nib()
 
         empty_key = t.NwkActiveKeyItems(
@@ -663,10 +655,7 @@ def nib(self, nib):
         self._nvram[ExNvIds.LEGACY][OsalNvIds.NIB] = self.nvram_serialize(nib)
 
     @reply_to(c.SYS.ResetReq.Req(Type=t.ResetType.Soft))
-    def reset_req(self, request, *, startup=True):
-        if startup:
-            self._startup()
-
+    def reset_req(self, request):
         version = self.version_replier(None)
 
         return c.SYS.ResetInd.Callback(
@@ -787,6 +776,8 @@ def startup_from_app(self, req):
                 self.update_device_state(t.DeviceState.StartedAsCoordinator),
             ]
         else:
+            self._create_network_nvram()
+
             return [
                 c.ZDO.StartupFromApp.Rsp(State=c.zdo.StartupState.NewNetworkState),
                 self.update_device_state(t.DeviceState.StartingAsCoordinator),
@@ -913,6 +904,8 @@ def handle_bdb_start_commissioning(self, request):
                 ),
             ]
         else:
+            self._create_network_nvram()
+
             return [
                 c.AppConfig.BDBStartCommissioning.Rsp(Status=t.Status.SUCCESS),
                 self.update_device_state(t.DeviceState.StartingAsCoordinator),
@@ -956,9 +949,7 @@ def connection_made(self):
         self._first_connection = False
 
         # Z-Stack 3 devices send a callback when they're first used
-        asyncio.get_running_loop().call_soon(
-            self.send, self.reset_req(None, startup=False)
-        )
+        asyncio.get_running_loop().call_soon(self.send, self.reset_req(None))
 
 
 class BaseLaunchpadCC26X2R1(BaseZStack3Device):
@@ -1114,6 +1105,21 @@ def version_replier(self, request):
     def led_responder(self, req):
         return req.Rsp(Status=t.Status.SUCCESS)
 
+    @reply_to(
+        c.AppConfig.BDBStartCommissioning.Req(
+            Mode=c.app_config.BDBCommissioningMode.NwkFormation
+        )
+    )
+    def handle_bdb_start_commissioning(self, request):
+        result = super().handle_bdb_start_commissioning(request)
+
+        # This item is only created after a network is formed
+        self._nvram[ExNvIds.LEGACY][OsalNvIds.ADDRMGR] = 124 * self.nvram_serialize(
+            t.EMPTY_ADDR_MGR_ENTRY
+        )
+
+        return result
+
 
 class FormedLaunchpadCC26X2R1(BaseLaunchpadCC26X2R1):
     def __init__(self, *args, **kwargs):

zigpy_znp/api.py

@@ -86,10 +86,11 @@ async def load_network_info(self, *, load_keys=False):
 
         try:
             nib = await self.nvram.osal_read(OsalNvIds.NIB, item_type=t.NIB)
-            is_on_network = nib.nwkLogicalChannel != 0 and nib.nwkKeyLoaded
         except KeyError:
             is_on_network = False
         else:
+            is_on_network = nib.nwkLogicalChannel != 0 and nib.nwkKeyLoaded
+
             if is_on_network and self.version >= 3.0:
                 # This NVRAM item is the very first thing initialized in `zgInit`
                 is_on_network = (
@@ -133,11 +134,16 @@ async def load_network_info(self, *, load_keys=False):
             ),
             tc_link_key=None,
             key_table=[],
-            stack_specific={
-                "TCLK_SEED": tclk_seed,
-            },
+            stack_specific=None,
         )
 
+        if tclk_seed is not None:
+            network_info.stack_specific = {
+                "zstack": {
+                    "tclk_seed": tclk_seed.serialize().hex(),
+                }
+            }
+
         # This takes a few seconds
         if load_keys:
             for device in await security.read_devices(self):

zigpy_znp/tools/network_backup.py

@@ -70,8 +70,12 @@ async def backup_network(znp: ZNP) -> t.JSONType:
         "devices": devices,
     }
 
-    if znp.network_info.stack_specific:
-        obj["stack_specific"] = znp.network_info.stack_specific
+    if znp.network_info.stack_specific.get("zstack", {}).get("tclk_seed"):
+        obj["stack_specific"] = {
+            "zstack": {
+                "tclk_seed": znp.network_info.stack_specific["zstack"]["tclk_seed"]
+            }
+        }
 
     # Ensure our generated backup is valid
     validate_backup_json(obj)