Keep track of children inside of internal, for now

Author: puddly

tests/tools/test_network_backup_restore.py

@@ -54,6 +54,7 @@ def backup_json():
             "internal": {
                 "creation_time": "2021-02-16T22:29:28+00:00",
                 "zstack": {"version": 3.3},
+                "children": ["000b57fffe38b212"],
             },
             "source": "[email protected]",
             "version": 1,

zigpy_znp/tools/common.py

@@ -35,7 +35,11 @@
                 "zstack": {
                     "type": "object",
                     "properties": {
-                        "tclk_seed": {"type": "string", "pattern": "[a-fA-F0-9]{32}"}
+                        "tclk_seed": {"type": "string", "pattern": "[a-fA-F0-9]{32}"},
+                        "children": {
+                            "type": "array",
+                            "items": {"type": "string", "pattern": "[a-fA-F0-9]{16}"},
+                        },
                     },
                 }
             },
@@ -70,7 +74,6 @@
                 "properties": {
                     "nwk_address": {"type": "string", "pattern": "[a-fA-F0-9]{4}"},
                     "ieee_address": {"type": "string", "pattern": "[a-fA-F0-9]{16}"},
-                    "is_child": {"type": "boolean"},
                     "link_key": {
                         "type": "object",
                         "properties": {

zigpy_znp/tools/network_backup.py

@@ -53,6 +53,10 @@ async def backup_network(znp: ZNP) -> t.JSONType:
                 "zstack": {
                     "version": znp.version,
                 },
+                "children": [
+                    neighbor.ieee.serialize()[::-1].hex()
+                    for neighbor in znp.network_info.neighbor_table
+                ],
             },
         },
         "coordinator_ieee": znp.node_info.ieee.serialize()[::-1].hex(),
@@ -71,11 +75,9 @@ async def backup_network(znp: ZNP) -> t.JSONType:
     }
 
     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"]
-            }
-        }
+        obj.setdefault("stack_specific", {}).setdefault("zstack", {})[
+            "tclk_seed"
+        ] = znp.network_info.stack_specific["zstack"]["tclk_seed"]
 
     # Ensure our generated backup is valid
     validate_backup_json(obj)

zigpy_znp/tools/network_restore.py

@@ -51,13 +51,16 @@ def json_backup_to_zigpy_state(
     network_info.key_table = []
     network_info.neighbor_table = []
 
+    children = backup["stack_specific"].get("zstack", {}).get("children")
+
     for obj in backup["devices"]:
         node = zigpy.state.NodeInfo()
         node.nwk, _ = t.NWK.deserialize(bytes.fromhex(obj["nwk_address"])[::-1])
         node.ieee, _ = t.EUI64.deserialize(bytes.fromhex(obj["ieee_address"])[::-1])
         node.logical_type = None
 
-        network_info.neighbor_table.append(node)
+        if children is None or obj["ieee_address"] in children:
+            network_info.neighbor_table.append(node)
 
         if "link_key" in obj:
             key = zigpy.state.Key()