BlueprintSledConfig: add sled subnet
#9416
Conversation
…omoting internal NTP
| Diffable, | ||
| )] | ||
| #[schemars(rename = "Ipv6Subnet")] | ||
| pub struct Ipv6Subnet<const N: u8> { |
There was a problem hiding this comment.
Hmm, https://docs.rs/oxnet has Ipv6Net but doesn't use a const generic. Nothing to change here but an interesting inconsistency.
There was a problem hiding this comment.
This is a newtype around oxnet::Ipv6Net, actually! All it does is add the const generic.
| nic: NetworkInterface { | ||
| id: uuid::Uuid::new_v4(), | ||
| kind: NetworkInterfaceKind::Service { | ||
| id: zone_id.into_untyped_uuid(), | ||
| }, |
There was a problem hiding this comment.
ew, we should use typed UUIDs here :(
| .slot_b | ||
| .artifact_hash() | ||
| .map(ArtifactHash), | ||
| subnet: Ipv6Network::from(sled.subnet).into(), |
There was a problem hiding this comment.
sighhh ideally we'd use oxnet here too
There was a problem hiding this comment.
IIUC this is relying on diesel knowing this type can be converted to/from sql_types::Inet: https://github.com/diesel-rs/diesel/blob/b7337c66d2b522348fa4e0fb11c44e561444bb4c/diesel/src/pg/types/network_address.rs#L33-L37
To use oxnet we'd need to add diesel support to it, I think?
There was a problem hiding this comment.
Yeah, I think so. Runs into annoying orphan rule issues.
Sled subnets are chosen when the sled is added to the cluster (either by RSS or by the "add sled" process), and do not change for the lifetime of the sled's membership. This PR adds that subnet to
BlueprintSledConfig, removing one of the remaining bits whereBlueprintBuilder::new_based_on()needs information other than the parent blueprint.This PR is staged on top of #9393.