update for ip_version field

Author: ahl

cli/docs/cli.json

@@ -2330,6 +2330,14 @@
               "long": "ip",
               "help": "An IP address to reserve for use as a floating IP. This field is optional: when not set, an address will be automatically chosen from `pool`. If set, then the IP must be available in the resolved `pool`."
             },
+            {
+              "long": "ip-version",
+              "values": [
+                "v4",
+                "v6"
+              ],
+              "help": "IP version to use when allocating from the default pool. Only used when both `ip` and `pool` are not specified. Required if multiple default pools of different IP versions exist. Allocation fails if no pool of the requested version is available."
+            },
             {
               "long": "json-body",
               "help": "Path to a file that contains the full json body."
@@ -3145,6 +3153,14 @@
                   "long": "instance",
                   "help": "Name or ID of the instance"
                 },
+                {
+                  "long": "ip-version",
+                  "values": [
+                    "v4",
+                    "v6"
+                  ],
+                  "help": "IP version to use when allocating from the default pool. Only used when `pool` is not specified. Required if multiple default pools of different IP versions exist. Allocation fails if no pool of the requested version is available."
+                },
                 {
                   "long": "json-body",
                   "help": "Path to a file that contains the full json body."
@@ -4470,7 +4486,7 @@
                     "true",
                     "false"
                   ],
-                  "help": "When a pool is the default for a silo, floating IPs and instance ephemeral IPs will come from that pool when no other pool is specified. There can be at most one default for a given silo."
+                  "help": "When a pool is the default for a silo, floating IPs and instance ephemeral IPs will come from that pool when no other pool is specified.\n\nA silo can have at most one default pool per combination of pool type (unicast or multicast) and IP version (IPv4 or IPv6), allowing up to 4 default pools total."
                 },
                 {
                   "long": "json-body",
@@ -4548,7 +4564,7 @@
                     "true",
                     "false"
                   ],
-                  "help": "When a pool is the default for a silo, floating IPs and instance ephemeral IPs will come from that pool when no other pool is specified. There can be at most one default for a given silo, so when a pool is made default, an existing default will remain linked but will no longer be the default."
+                  "help": "When a pool is the default for a silo, floating IPs and instance ephemeral IPs will come from that pool when no other pool is specified.\n\nA silo can have at most one default pool per combination of pool type (unicast or multicast) and IP version (IPv4 or IPv6), allowing up to 4 default pools total. When a pool is made default, an existing default of the same type and version will remain linked but will no longer be the default."
                 },
                 {
                   "long": "json-body",

cli/src/cmd_instance.rs

@@ -9,7 +9,7 @@ use async_trait::async_trait;
 use clap::Parser;
 use oxide::types::{
     ByteCount, DiskBackend, DiskSource, ExternalIpCreate, InstanceCpuCount, InstanceDiskAttachment,
-    Name, NameOrId,
+    IpVersion, Name, NameOrId,
 };
 
 use oxide::ClientInstancesExt;
@@ -277,7 +277,10 @@ impl crate::AuthenticatedCmd for CmdInstanceFromImage {
                             .expect("valid disk name"),
                         size: self.size.clone(),
                     })
-                    .external_ips(vec![ExternalIpCreate::Ephemeral { pool: None }])
+                    .external_ips(vec![ExternalIpCreate::Ephemeral {
+                        ip_version: Some(IpVersion::V4),
+                        pool: None,
+                    }])
                     .hostname(self.hostname.clone())
                     .memory(self.memory.clone())
                     .ncpus(self.ncpus.clone())