Add IP pool ID to ephemeral IP view (#8564)

Fixes #6825

Author: bnaecker

end-to-end-tests/src/instance_launch.rs

@@ -95,7 +95,7 @@ async fn instance_launch() -> Result<()> {
         .context("no external IPs")?
         .clone();
 
-    let ExternalIp::Ephemeral { ip: ip_addr } = ip_addr else {
+    let ExternalIp::Ephemeral { ip: ip_addr, .. } = ip_addr else {
         anyhow::bail!("IP bound to instance was not ephemeral as required.")
     };
     eprintln!("instance external IP: {}", ip_addr);

nexus/db-model/src/external_ip.rs

@@ -529,9 +529,10 @@ impl TryFrom<ExternalIp> for views::ExternalIp {
         }
         match ip.kind {
             IpKind::Floating => Ok(views::ExternalIp::Floating(ip.try_into()?)),
-            IpKind::Ephemeral => {
-                Ok(views::ExternalIp::Ephemeral { ip: ip.ip.ip() })
-            }
+            IpKind::Ephemeral => Ok(views::ExternalIp::Ephemeral {
+                ip: ip.ip.ip(),
+                ip_pool_id: ip.ip_pool_id,
+            }),
             IpKind::SNat => Err(Error::internal_error(
                 "SNAT IP addresses should not be exposed in the API",
             )),

nexus/types/src/external_api/views.rs

@@ -502,14 +502,14 @@ pub struct IpPoolRange {
 #[derive(Debug, Clone, Deserialize, PartialEq, Serialize, JsonSchema)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum ExternalIp {
-    Ephemeral { ip: IpAddr },
+    Ephemeral { ip: IpAddr, ip_pool_id: Uuid },
     Floating(FloatingIp),
 }
 
 impl ExternalIp {
     pub fn ip(&self) -> IpAddr {
         match self {
-            Self::Ephemeral { ip } => *ip,
+            Self::Ephemeral { ip, .. } => *ip,
             Self::Floating(float) => float.ip,
         }
     }

openapi/nexus.json

@@ -17580,6 +17580,10 @@
                 "type": "string",
                 "format": "ip"
               },
+              "ip_pool_id": {
+                "type": "string",
+                "format": "uuid"
+              },
               "kind": {
                 "type": "string",
                 "enum": [
@@ -17589,6 +17593,7 @@
             },
             "required": [
               "ip",
+              "ip_pool_id",
               "kind"
             ]
           },