Skip to content

Commit e87ac05

Browse files
authored
[sled-agent] Support bundle storage api (#6782)
This PR implements raw bundle storage for support bundles. In the future, I expect that Nexus will invoke these APIs to store and later access portions of storage bundles. - Provides an API to create, list, query, and delete support bundles - Implements range request support for these APIs Fixes #1599
1 parent e7d32ae commit e87ac05

File tree

17 files changed

+2604
-60
lines changed

17 files changed

+2604
-60
lines changed

Cargo.lock

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nexus/test-utils/src/resource_helpers.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ use omicron_test_utils::dev::poll::wait_for_condition;
5252
use omicron_test_utils::dev::poll::CondCheckError;
5353
use omicron_uuid_kinds::DatasetUuid;
5454
use omicron_uuid_kinds::GenericUuid;
55+
use omicron_uuid_kinds::PhysicalDiskUuid;
5556
use omicron_uuid_kinds::SledUuid;
5657
use omicron_uuid_kinds::ZpoolUuid;
5758
use oxnet::Ipv4Net;
@@ -1187,7 +1188,7 @@ impl<'a, N: NexusServer> DiskTest<'a, N> {
11871188
pub async fn add_zpool_with_dataset(&mut self, sled_id: SledUuid) {
11881189
self.add_zpool_with_dataset_ext(
11891190
sled_id,
1190-
Uuid::new_v4(),
1191+
PhysicalDiskUuid::new_v4(),
11911192
ZpoolUuid::new_v4(),
11921193
DatasetUuid::new_v4(),
11931194
Self::DEFAULT_ZPOOL_SIZE_GIB,
@@ -1220,7 +1221,7 @@ impl<'a, N: NexusServer> DiskTest<'a, N> {
12201221
pub async fn add_zpool_with_dataset_ext(
12211222
&mut self,
12221223
sled_id: SledUuid,
1223-
physical_disk_id: Uuid,
1224+
physical_disk_id: PhysicalDiskUuid,
12241225
zpool_id: ZpoolUuid,
12251226
dataset_id: DatasetUuid,
12261227
gibibytes: u32,
@@ -1243,7 +1244,7 @@ impl<'a, N: NexusServer> DiskTest<'a, N> {
12431244

12441245
let physical_disk_request =
12451246
nexus_types::internal_api::params::PhysicalDiskPutRequest {
1246-
id: physical_disk_id,
1247+
id: *physical_disk_id.as_untyped_uuid(),
12471248
vendor: disk_identity.vendor.clone(),
12481249
serial: disk_identity.serial.clone(),
12491250
model: disk_identity.model.clone(),
@@ -1255,7 +1256,7 @@ impl<'a, N: NexusServer> DiskTest<'a, N> {
12551256
let zpool_request =
12561257
nexus_types::internal_api::params::ZpoolPutRequest {
12571258
id: zpool.id.into_untyped_uuid(),
1258-
physical_disk_id,
1259+
physical_disk_id: *physical_disk_id.as_untyped_uuid(),
12591260
sled_id: sled_id.into_untyped_uuid(),
12601261
};
12611262

0 commit comments

Comments
 (0)