fix(regression): fix test_inc_restoration_with_multiple_rebuild_and_expansion

Adjust test_inc_restoration_with_multiple_rebuild_and_expansion for
the v2 data engine snapshot model.

The old v2 assertions expected the DR volume to contain only
volume-head after incremental restore and expansion. That does not
match the current SPDK restore flow, which preserves the latest
restore-* snapshot for traceability and may create temporary rebuild
system snapshots during recovery.

Update the test to:
- wait for temporary v2 system snapshots to be purged
- expect restore-* plus volume-head as the stable snapshot layout
- verify the restore snapshot/volume-head parent-child relationship

This keeps the v1 expectations unchanged while making the HA DR test
match v2 restore behavior.

Longhorn 13075

Signed-off-by: Derek Su <derek.su@suse.com>

Author: derekbit

manager/integration/tests/test_ha.py

@@ -79,6 +79,7 @@
 from common import wait_for_backup_volume_backing_image_synced
 from common import RETRY_COMMAND_COUNT
 from common import wait_for_snapshot_count
+from common import wait_for_system_snapshot_count
 from common import DEFAULT_BACKUP_COMPRESSION_METHOD
 from common import wait_scheduling_failure
 from common import set_tags_for_node_and_its_disks
@@ -1015,6 +1016,34 @@ def test_rebuild_with_inc_restoration(set_random_backupstore, client, core_api,
     backupstore_cleanup(client)
 
 
+def verify_v2_restored_snapshot_info(volume, vol_name):
+    # For V2, restore completion leaves the latest restore snapshot as the
+    # only non-system snapshot and volume-head points to it. Rebuild may
+    # create temporary system snapshots, so wait for them to be purged.
+    wait_for_system_snapshot_count(volume, 0)
+    wait_for_snapshot_count(volume, 2, count_removed=True)
+    snapshots = volume.snapshotList(volume=vol_name)
+    assert len(snapshots.data) == 2
+
+    snapshot_map = {snap["name"]: snap for snap in snapshots.data}
+    assert "volume-head" in snapshot_map
+
+    restore_snapshot_names = [
+        name for name in snapshot_map if name != "volume-head"
+    ]
+    assert len(restore_snapshot_names) == 1
+
+    restore_snapshot_name = restore_snapshot_names[0]
+    restore_snapshot = snapshot_map[restore_snapshot_name]
+    volume_head = snapshot_map["volume-head"]
+
+    assert restore_snapshot_name.startswith("restore-")
+    assert restore_snapshot["usercreated"]
+    assert restore_snapshot["parent"] == ""
+    assert "volume-head" in restore_snapshot["children"]
+    assert volume_head["parent"] == restore_snapshot_name
+
+
 @pytest.mark.v2_volume_test  # NOQA
 def test_inc_restoration_with_multiple_rebuild_and_expansion(set_random_backupstore, client, core_api, volume_name, storage_class, csi_pv, pvc, pod_make): # NOQA
     """
@@ -1034,8 +1063,7 @@ def test_inc_restoration_with_multiple_rebuild_and_expansion(set_random_backupst
     11. For the DR volume, delete one replica and trigger incremental restore
         simultaneously.
     12. Wait for the inc restoration complete and the volume becoming Healthy.
-    13. Check the DR volume size and snapshot info. Make sure there is only
-        one snapshot in the volume.
+    13. Check the DR volume size and snapshot info.
     14. Online expand the std volume and wait for expansion complete.
     15. Write data to the std volume then create the 3rd backup.
     16. Trigger the inc restore then re-verify the snapshot info.
@@ -1162,14 +1190,7 @@ def test_inc_restoration_with_multiple_rebuild_and_expansion(set_random_backupst
                 assert not snap["usercreated"]
                 assert "volume-head" in snap["children"]
     else:
-        # v2 expansion resizes lvol bdevs directly without creating an
-        # expand-<size> snapshot, so only volume-head remains.
-        wait_for_snapshot_count(dr_volume, 1, count_removed=True)
-        snapshots = dr_volume.snapshotList(volume=dr_volume_name)
-        assert len(snapshots.data) == 1
-        snap = snapshots.data[0]
-        assert snap["name"] == "volume-head"
-        assert snap["parent"] == ""
+        verify_v2_restored_snapshot_info(dr_volume, dr_volume_name)
 
     # Step 14: Do online expansion for the std volume.
     expand_size2 = 3 * Gi
@@ -1207,12 +1228,7 @@ def test_inc_restoration_with_multiple_rebuild_and_expansion(set_random_backupst
                 assert not snap["usercreated"]
                 assert "volume-head" in snap["children"]
     else:
-        wait_for_snapshot_count(dr_volume, 1, count_removed=True)
-        snapshots = dr_volume.snapshotList(volume=dr_volume_name)
-        assert len(snapshots.data) == 1
-        snap = snapshots.data[0]
-        assert snap["name"] == "volume-head"
-        assert snap["parent"] == ""
+        verify_v2_restored_snapshot_info(dr_volume, dr_volume_name)
 
     activate_standby_volume(client, dr_volume_name)
     wait_for_volume_detached(client, dr_volume_name)