Target replacement support for VCRs with multiple sub_volumes

Cargo.toml

@@ -48,6 +48,7 @@ crossterm = { version = "0.28.1" }
 crucible-workspace-hack = "0.1.0"  # see [patch.crates-io.crucible-workspace-hack] for more
 csv = "1.3.0"
 expectorate = "1.1.0"
+fakedata_generator = "0.5"
 futures = "0.3"
 futures-core = "0.3"
 hex = "0.4"

integration_tests/src/lib.rs

@@ -5701,7 +5701,7 @@ mod test {
         let new_vol = VolumeConstructionRequest::Volume {
             id: sv_volume_id,
             block_size: BLOCK_SIZE as u64,
-            sub_volumes: new_sub_vol.clone(),
+            sub_volumes: new_sub_vol,
             read_only_parent: Some(rop),
         };
 
@@ -5715,6 +5715,14 @@ mod test {
         let new_downstairs = tds.new_downstairs().await.unwrap();
         info!(log, "A New downstairs: {:?}", new_downstairs.address());
 
+        let more_sub_vol = vec![VolumeConstructionRequest::Region {
+            block_size: BLOCK_SIZE as u64,
+            blocks_per_extent: sv_tds.blocks_per_extent(),
+            extent_count: sv_tds.extent_count(),
+            opts: sv_opts.clone(),
+            gen: 3,
+        }];
+
         let mut new_opts = tds.opts().clone();
         new_opts.target[0] = new_downstairs.address();
         info!(log, "Old ops target: {:?}", opts.target);
@@ -5732,7 +5740,7 @@ mod test {
         let replacement = VolumeConstructionRequest::Volume {
             id: sv_volume_id,
             block_size: BLOCK_SIZE as u64,
-            sub_volumes: new_sub_vol.clone(),
+            sub_volumes: more_sub_vol,
             read_only_parent: Some(new_rop),
         };
 

upstairs/Cargo.toml

@@ -28,6 +28,7 @@ crucible-common.workspace = true
 crucible-client-types.workspace = true
 crucible-protocol.workspace = true
 dropshot.workspace = true
+fakedata_generator.workspace = true
 futures.workspace = true
 futures-core.workspace = true
 itertools.workspace = true