Skip to content
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8f0ffe1
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Dec 18, 2025
5b645b6
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 18, 2025
c4550be
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 18, 2025
66eed31
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
f77213d
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Dec 26, 2025
5249f29
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Dec 26, 2025
2205ee7
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
c2adcb6
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
677a241
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Dec 26, 2025
14abf58
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
11d7e8e
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
63ae03b
Merge branch 'main' into integration
oxide-reflector-bot[bot] Dec 26, 2025
37ff024
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Dec 31, 2025
1beed5d
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 2, 2026
0d7320e
update for ip_version field
ahl Jan 4, 2026
503fcba
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 4, 2026
47ffc36
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 4, 2026
4597268
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 4, 2026
30e2ef9
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 4, 2026
ba112c9
update test
ahl Jan 4, 2026
d38a6e2
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 8, 2026
647fa91
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 8, 2026
13150ec
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 8, 2026
d335a11
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 8, 2026
5b1d038
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 10, 2026
afe5d65
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 10, 2026
4b343e7
Rebuilt with latest dependency updates
oxide-reflector-bot[bot] Jan 10, 2026
4dc3642
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 11, 2026
5aa9e74
update
ahl Jan 11, 2026
b7b91ae
Merge branch 'main' into integration
oxide-reflector-bot[bot] Jan 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions Cargo.lock

Large diffs are not rendered by default.

240 changes: 38 additions & 202 deletions cli/docs/cli.json

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions cli/src/cli_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -744,16 +744,8 @@ fn xxx<'a>(command: CliCommand) -> Option<&'a str> {
CliCommand::ProbeView => Some("experimental system probe view"),

CliCommand::MulticastGroupList => Some("experimental multicast-group list"),
CliCommand::MulticastGroupCreate => Some("experimental multicast-group create"),
CliCommand::MulticastGroupView => Some("experimental multicast-group view"),
CliCommand::MulticastGroupDelete => Some("experimental multicast-group delete"),
CliCommand::MulticastGroupUpdate => Some("experimental multicast-group update"),
CliCommand::MulticastGroupMemberList => Some("experimental multicast-group member list"),
CliCommand::MulticastGroupMemberAdd => Some("experimental multicast-group member add"),
CliCommand::MulticastGroupMemberRemove => {
Some("experimental multicast-group member remove")
}
CliCommand::LookupMulticastGroupByIp => Some("experimental multicast-group lookup-by-ip"),

// Metrics-related subcommands
CliCommand::TimeseriesQuery => Some("experimental timeseries query"),
Expand Down
7 changes: 4 additions & 3 deletions cli/src/cmd_instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use async_trait::async_trait;
use clap::Parser;
use oxide::types::{
ByteCount, DiskBackend, DiskSource, ExternalIpCreate, InstanceCpuCount, InstanceDiskAttachment,
IpVersion, Name, NameOrId,
IpVersion, Name, NameOrId, PoolSelector,
};

use oxide::ClientInstancesExt;
Expand Down Expand Up @@ -278,8 +278,9 @@ impl crate::AuthenticatedCmd for CmdInstanceFromImage {
size: self.size.clone(),
})
.external_ips(vec![ExternalIpCreate::Ephemeral {
ip_version: Some(IpVersion::V4),
pool: None,
pool_selector: PoolSelector::Auto {
ip_version: Some(IpVersion::V4),
},
}])
.hostname(self.hostname.clone())
.memory(self.memory.clone())
Expand Down
784 changes: 134 additions & 650 deletions cli/src/generated_cli.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/tests/data/test_instance_create.stdin
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"name": "name",
"ncpus": 4,
"network_interfaces": {
"type": "default"
"type": "default_dual_stack"
Copy link
Collaborator

Choose a reason for hiding this comment

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

@bnaecker does this match your intention? vis-a-vis oxidecomputer/omicron#9508

},
"start": true,
"user_data": ""
Expand Down
Loading
Loading