Skip to content

Bump dependencies, progenitor to d58416b9, oxide.json to omicron:7a911ab4#1438

Merged
ahl merged 6 commits into
mainfrom
integration
May 13, 2026
Merged

Bump dependencies, progenitor to d58416b9, oxide.json to omicron:7a911ab4#1438
ahl merged 6 commits into
mainfrom
integration

Conversation

@oxide-reflector-bot
Copy link
Copy Markdown
Contributor

@oxide-reflector-bot oxide-reflector-bot Bot commented May 7, 2026

Lock file updated

Bump progenitor from 1a5b88f7 to d58416b9
Changes: oxidecomputer/progenitor@1a5b88f...d58416b

Generated code against nexus-2026050800.0.0-d2276f.json 7a911ab4

@oxide-reflector-bot oxide-reflector-bot Bot changed the title Bump dependencies, progenitor to a6444390, oxide.json to omicron:9e56717d Bump dependencies, progenitor to a6444390, oxide.json to omicron:7a911ab4 May 9, 2026
@oxide-reflector-bot oxide-reflector-bot Bot changed the title Bump dependencies, progenitor to a6444390, oxide.json to omicron:7a911ab4 Bump dependencies, progenitor to d58416b9, oxide.json to omicron:7a911ab4 May 12, 2026
Comment thread cli/src/cli_builder.rs
Comment on lines +724 to +729
CliCommand::PhysicalDiskDisableAdoption => Some("system hardware disk disable-adoption"),
CliCommand::PhysicalDiskEnableAdoption => Some("system hardware disk enable-adoption"),
CliCommand::PhysicalDiskListAdoptionRequests => {
Some("system hardware disk adoption-requests")
}
CliCommand::PhysicalDiskListUnadopted => Some("system hardware disk list-unadopted"),
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewjstone is this what you had in mind?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Looks great. Thank you @ahl.

Comment thread cli/src/cmd_net.rs
Comment on lines +1812 to -1841
let interfaces = current
.interfaces
.iter()
.into_iter()
.map(|x| SwitchInterfaceConfigCreate {
link_name: x.interface_name.parse().unwrap(),
kind: match x.kind {
SwitchInterfaceKind2::Primary => SwitchInterfaceKind::Primary,
SwitchInterfaceKind2::Loopback => SwitchInterfaceKind::Loopback,
SwitchInterfaceKind2::Vlan => {
todo!("vlan interface outside vlan interfaces?")
}
},
link_name: x.interface_name,
kind: x.kind,
v6_enabled: x.v6_enabled,
})
.collect::<Vec<_>>();

for v in current.vlan_interfaces.iter() {
interfaces.push(SwitchInterfaceConfigCreate {
link_name: format!("vlan-{}", v.vlan_id).parse().unwrap(),
kind: SwitchInterfaceKind::Vlan(v.vlan_id),
v6_enabled: false,
});
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jgallagher this is so much nicer

@ahl ahl merged commit e862d11 into main May 13, 2026
17 checks passed
@ahl ahl deleted the integration branch May 13, 2026 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants