Update to match new zigpy state key structure

Author: puddly

zigpy_znp/api.py

@@ -139,19 +139,14 @@ async def load_network_info(self, *, load_devices=False):
             channel=nib.nwkLogicalChannel,
             channel_mask=nib.channelList,
             security_level=nib.SecurityLevel,
-            network_key=zigpy.state.Key(
-                key=key_desc.Key,
-                seq=key_desc.KeySeqNum,
-                tx_counter=tc_frame_counter,
-                rx_counter=0,
-                partner_ieee=node_info.ieee,
-            ),
-            tc_link_key=zigpy.state.Key(
-                key=const.DEFAULT_TC_LINK_KEY,
-                seq=0,
-                tx_counter=0,
-                rx_counter=0,
-                partner_ieee=t.EUI64.convert("FF:FF:FF:FF:FF:FF:FF:FF"),
+            network_key=key_desc.Key,
+            network_key_seq=key_desc.KeySeqNum,
+            network_key_counter=tc_frame_counter,
+            tc_link_key=const.DEFAULT_TC_LINK_KEY,
+            tc_address=(
+                node_info.ieee
+                if node_info.logical_type == zdo_t.LogicalType.Coordinator
+                else None
             ),
             children=[],
             nwk_addresses={},
@@ -179,8 +174,9 @@ async def load_network_info(self, *, load_devices=False):
                     )
 
                 if dev.is_child:
-                    network_info.children.append(dev.node_info)
-                elif dev.node_info.nwk is not None:
+                    network_info.children.append(dev.node_info.ieee)
+
+                if dev.node_info.nwk is not None:
                     network_info.nwk_addresses[dev.node_info.ieee] = dev.node_info.nwk
 
                 if dev.key is not None:
@@ -345,10 +341,10 @@ async def write_network_info(
 
         key_info = t.NwkActiveKeyItems(
             Active=t.NwkKeyDesc(
-                KeySeqNum=network_info.network_key.seq,
-                Key=network_info.network_key.key,
+                KeySeqNum=network_info.network_key_seq,
+                Key=network_info.network_key,
             ),
-            FrameCounter=network_info.network_key.tx_counter,
+            FrameCounter=network_info.network_key_counter,
         )
 
         nvram = {
@@ -369,19 +365,19 @@ async def write_network_info(
             # TCLK_SEED is TCLK_TABLE_START in Z-Stack 1
             nvram[OsalNvIds.TCLK_SEED] = t.TCLinkKey(
                 ExtAddr=t.EUI64.convert("FF:FF:FF:FF:FF:FF:FF:FF"),  # global
-                Key=network_info.tc_link_key.key or const.DEFAULT_TC_LINK_KEY,
+                Key=network_info.tc_link_key or const.DEFAULT_TC_LINK_KEY,
                 TxFrameCounter=0,
                 RxFrameCounter=0,
             )
         else:
             if (
                 network_info.tc_link_key is not None
-                and network_info.tc_link_key.key != const.DEFAULT_TC_LINK_KEY
+                and network_info.tc_link_key != const.DEFAULT_TC_LINK_KEY
             ):
                 LOGGER.warning(
                     "TC link key is configured at build time in Z-Stack 3 and cannot be"
                     " changed at runtime: %s",
-                    network_info.tc_link_key.key,
+                    network_info.tc_link_key,
                 )
 
             if (
@@ -401,7 +397,7 @@ async def write_network_info(
 
         await security.write_tc_frame_counter(
             self,
-            network_info.network_key.tx_counter,
+            network_info.network_key_counter,
             ext_pan_id=network_info.extended_pan_id,
         )
 

zigpy_znp/tools/network_restore.py

@@ -39,16 +39,13 @@ def json_backup_to_zigpy_state(
     network_info.channel_mask = t.Channels.from_channel_list(backup["channel_mask"])
     network_info.security_level = backup["security_level"]
     network_info.stack_specific = backup.get("stack_specific")
-    network_info.tc_link_key.key = const.DEFAULT_TC_LINK_KEY
+    network_info.tc_link_key = const.DEFAULT_TC_LINK_KEY
 
-    network_info.network_key = zigpy.state.Key()
-    network_info.network_key.key, _ = t.KeyData.deserialize(
+    network_info.network_key, _ = t.KeyData.deserialize(
         bytes.fromhex(backup["network_key"]["key"])
     )
-    network_info.network_key.tx_counter = backup["network_key"]["frame_counter"]
-    network_info.network_key.rx_counter = 0
-    network_info.network_key.partner_ieee = None
-    network_info.network_key.seq = backup["network_key"]["sequence_number"]
+    network_info.network_key_counter = backup["network_key"]["frame_counter"]
+    network_info.network_key_seq = backup["network_key"]["sequence_number"]
 
     network_info.children = []
     network_info.nwk_addresses = {}
@@ -92,7 +89,7 @@ async def restore_network(
     counter_increment: int,
 ) -> None:
     network_info, node_info = json_backup_to_zigpy_state(backup)
-    network_info.network_key.tx_counter += counter_increment
+    network_info.network_key_counter += counter_increment
 
     znp = ZNP(ControllerApplication.SCHEMA({"device": {"path": radio_path}}))
     await znp.connect()