[post-merge,openapi] updates

zeeshanlakhani · zeeshanlakhani · commit 9002d368022a · 2026-01-21T19:37:42.000Z
Match API versioning guidelines
diff --git a/nexus/external-api/src/lib.rs b/nexus/external-api/src/lib.rs
@@ -1726,30 +1726,6 @@ pub trait NexusExternalApi {
     // TODO: Consider adding `.map()` to dropshot's `Path<T>` (like `TypedBody`)
     // to enable inline delegation when path types differ between API versions.
 
-    /// List multicast groups
-    #[endpoint {
-        method = GET,
-        path = "/v1/multicast-groups",
-        tags = ["experimental"],
-        operation_id = "multicast_group_list",
-        versions = ..VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES,
-    }]
-    async fn v2025121200_multicast_group_list(
-        rqctx: RequestContext<Self::Context>,
-        query_params: Query<PaginatedByNameOrId>,
-    ) -> Result<
-        HttpResponseOk<ResultsPage<v2025121200::MulticastGroup>>,
-        HttpError,
-    > {
-        match Self::multicast_group_list(rqctx, query_params).await {
-            Ok(HttpResponseOk(page)) => Ok(HttpResponseOk(ResultsPage {
-                items: page.items.into_iter().map(|g| g.into()).collect(),
-                next_page: page.next_page,
-            })),
-            Err(e) => Err(e),
-        }
-    }
-
     /// List multicast groups
     #[endpoint {
         method = GET,
@@ -1763,9 +1739,6 @@ pub trait NexusExternalApi {
     ) -> Result<HttpResponseOk<ResultsPage<views::MulticastGroup>>, HttpError>;
 
     /// List multicast groups
-    ///
-    /// Prior version that included deprecated `mvlan` field and omitted
-    /// `has_any_source_member`.
     #[endpoint {
         method = GET,
         path = "/v1/multicast-groups",
@@ -1787,6 +1760,30 @@ pub trait NexusExternalApi {
         }))
     }
 
+    /// List multicast groups
+    #[endpoint {
+        method = GET,
+        path = "/v1/multicast-groups",
+        tags = ["experimental"],
+        operation_id = "multicast_group_list",
+        versions = ..VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES,
+    }]
+    async fn v2025121200_multicast_group_list(
+        rqctx: RequestContext<Self::Context>,
+        query_params: Query<PaginatedByNameOrId>,
+    ) -> Result<
+        HttpResponseOk<ResultsPage<v2025121200::MulticastGroup>>,
+        HttpError,
+    > {
+        match Self::multicast_group_list(rqctx, query_params).await {
+            Ok(HttpResponseOk(page)) => Ok(HttpResponseOk(ResultsPage {
+                items: page.items.into_iter().map(|g| g.into()).collect(),
+                next_page: page.next_page,
+            })),
+            Err(e) => Err(e),
+        }
+    }
+
     /// Create a multicast group
     ///
     /// Deprecated: Groups are created implicitly when adding members in newer
@@ -1812,23 +1809,6 @@ pub trait NexusExternalApi {
         ))
     }
 
-    /// Fetch a multicast group
-    ///
-    /// The group can be specified by name or UUID.
-    #[endpoint {
-        method = GET,
-        path = "/v1/multicast-groups/{multicast_group}",
-        tags = ["experimental"],
-        operation_id = "multicast_group_view",
-        versions = ..VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES,
-    }]
-    // Cannot delegate inline: path types differ (NameOrId vs MulticastGroupIdentifier)
-    // and can't construct Path<T> (Dropshot extractor with private fields).
-    async fn v2025121200_multicast_group_view(
-        rqctx: RequestContext<Self::Context>,
-        path_params: Path<v2025121200::MulticastGroupPath>,
-    ) -> Result<HttpResponseOk<v2025121200::MulticastGroup>, HttpError>;
-
     /// Fetch a multicast group
     ///
     /// The group can be specified by name, UUID, or multicast IP address
@@ -1846,8 +1826,8 @@ pub trait NexusExternalApi {
 
     /// Fetch multicast group
     ///
-    /// Prior version that included deprecated `mvlan` field and omitted
-    /// `has_any_source_member`.
+    /// The group can be specified by name, UUID, or multicast IP address.
+    /// (e.g., "224.1.2.3" or "ff38::1").
     #[endpoint {
         method = GET,
         path = "/v1/multicast-groups/{multicast_group}",
@@ -1863,6 +1843,23 @@ pub trait NexusExternalApi {
         Ok(HttpResponseOk(group.into()))
     }
 
+    /// Fetch a multicast group
+    ///
+    /// The group can be specified by name or UUID.
+    #[endpoint {
+        method = GET,
+        path = "/v1/multicast-groups/{multicast_group}",
+        tags = ["experimental"],
+        operation_id = "multicast_group_view",
+        versions = ..VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES,
+    }]
+    // Cannot delegate inline: path types differ (NameOrId vs MulticastGroupIdentifier)
+    // and can't construct Path<T> (Dropshot extractor with private fields).
+    async fn v2025121200_multicast_group_view(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<v2025121200::MulticastGroupPath>,
+    ) -> Result<HttpResponseOk<v2025121200::MulticastGroup>, HttpError>;
+
     /// Update a multicast group
     ///
     /// Deprecated: groups are managed implicitly through member operations.
@@ -1908,6 +1905,21 @@ pub trait NexusExternalApi {
         ))
     }
 
+    /// List members of multicast group
+    ///
+    /// The group can be specified by name, UUID, or multicast IP address.
+    #[endpoint {
+        method = GET,
+        path = "/v1/multicast-groups/{multicast_group}/members",
+        tags = ["experimental"],
+        versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
+    }]
+    async fn multicast_group_member_list(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<params::MulticastGroupPath>,
+        query_params: Query<PaginatedById>,
+    ) -> Result<HttpResponseOk<ResultsPage<MulticastGroupMember>>, HttpError>;
+
     /// List members of multicast group
     ///
     /// The group can be specified by name or UUID.
@@ -1929,21 +1941,6 @@ pub trait NexusExternalApi {
         HttpError,
     >;
 
-    /// List members of multicast group
-    ///
-    /// The group can be specified by name, UUID, or multicast IP address.
-    #[endpoint {
-        method = GET,
-        path = "/v1/multicast-groups/{multicast_group}/members",
-        tags = ["experimental"],
-        versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
-    }]
-    async fn multicast_group_member_list(
-        rqctx: RequestContext<Self::Context>,
-        path_params: Path<params::MulticastGroupPath>,
-        query_params: Query<PaginatedById>,
-    ) -> Result<HttpResponseOk<ResultsPage<MulticastGroupMember>>, HttpError>;
-
     /// Add instance to multicast group
     ///
     /// Deprecated: use the instance join endpoint which supports implicit group
@@ -3718,6 +3715,22 @@ pub trait NexusExternalApi {
 
     // Instance Multicast Groups
 
+    /// List multicast groups for an instance
+    #[endpoint {
+        method = GET,
+        path = "/v1/instances/{instance}/multicast-groups",
+        tags = ["experimental"],
+        versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
+    }]
+    async fn instance_multicast_group_list(
+        rqctx: RequestContext<Self::Context>,
+        query_params: Query<PaginatedById<params::OptionalProjectSelector>>,
+        path_params: Path<params::InstancePath>,
+    ) -> Result<
+        HttpResponseOk<ResultsPage<views::MulticastGroupMember>>,
+        HttpError,
+    >;
+
     /// List multicast groups for an instance
     #[endpoint {
         method = GET,
@@ -3752,21 +3765,28 @@ pub trait NexusExternalApi {
         }
     }
 
-    /// List multicast groups for an instance
+    /// Join multicast group by name, IP address, or UUID
+    ///
+    /// Groups can be referenced by name, IP address, or UUID. If the group
+    /// doesn't exist, it's implicitly created with an auto-allocated IP from a
+    /// multicast pool linked to the caller's silo. When referencing by UUID,
+    /// the group must already exist.
+    ///
+    /// Source IPs are optional for ASM addresses but required for SSM addresses
+    /// (232.0.0.0/8 for IPv4, ff3x::/32 for IPv6). Duplicate IPs in the request
+    /// are automatically deduplicated, with a maximum of 64 source IPs allowed.
     #[endpoint {
-        method = GET,
-        path = "/v1/instances/{instance}/multicast-groups",
+        method = PUT,
+        path = "/v1/instances/{instance}/multicast-groups/{multicast_group}",
         tags = ["experimental"],
         versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
     }]
-    async fn instance_multicast_group_list(
+    async fn instance_multicast_group_join(
         rqctx: RequestContext<Self::Context>,
-        query_params: Query<PaginatedById<params::OptionalProjectSelector>>,
-        path_params: Path<params::InstancePath>,
-    ) -> Result<
-        HttpResponseOk<ResultsPage<views::MulticastGroupMember>>,
-        HttpError,
-    >;
+        path_params: Path<params::InstanceMulticastGroupPath>,
+        query_params: Query<params::OptionalProjectSelector>,
+        body_params: TypedBody<params::InstanceMulticastGroupJoin>,
+    ) -> Result<HttpResponseCreated<views::MulticastGroupMember>, HttpError>;
 
     /// Join multicast group
     ///
@@ -3786,28 +3806,18 @@ pub trait NexusExternalApi {
         query_params: Query<params::OptionalProjectSelector>,
     ) -> Result<HttpResponseCreated<v2025121200::MulticastGroupMember>, HttpError>;
 
-    /// Join multicast group by name, IP address, or UUID
-    ///
-    /// Groups can be referenced by name, IP address, or UUID. If the group
-    /// doesn't exist, it's implicitly created with an auto-allocated IP from a
-    /// multicast pool linked to the caller's silo. When referencing by UUID,
-    /// the group must already exist.
-    ///
-    /// Source IPs are optional for ASM addresses but required for SSM addresses
-    /// (232.0.0.0/8 for IPv4, ff3x::/32 for IPv6). Duplicate IPs in the request
-    /// are automatically deduplicated, with a maximum of 64 source IPs allowed.
+    /// Leave multicast group by name, IP address, or UUID
     #[endpoint {
-        method = PUT,
+        method = DELETE,
         path = "/v1/instances/{instance}/multicast-groups/{multicast_group}",
         tags = ["experimental"],
         versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
     }]
-    async fn instance_multicast_group_join(
+    async fn instance_multicast_group_leave(
         rqctx: RequestContext<Self::Context>,
         path_params: Path<params::InstanceMulticastGroupPath>,
         query_params: Query<params::OptionalProjectSelector>,
-        body_params: TypedBody<params::InstanceMulticastGroupJoin>,
-    ) -> Result<HttpResponseCreated<views::MulticastGroupMember>, HttpError>;
+    ) -> Result<HttpResponseDeleted, HttpError>;
 
     /// Leave multicast group
     ///
@@ -3827,19 +3837,6 @@ pub trait NexusExternalApi {
         query_params: Query<params::OptionalProjectSelector>,
     ) -> Result<HttpResponseDeleted, HttpError>;
 
-    /// Leave multicast group by name, IP address, or UUID
-    #[endpoint {
-        method = DELETE,
-        path = "/v1/instances/{instance}/multicast-groups/{multicast_group}",
-        tags = ["experimental"],
-        versions = VERSION_MULTICAST_IMPLICIT_LIFECYCLE_UPDATES..,
-    }]
-    async fn instance_multicast_group_leave(
-        rqctx: RequestContext<Self::Context>,
-        path_params: Path<params::InstanceMulticastGroupPath>,
-        query_params: Query<params::OptionalProjectSelector>,
-    ) -> Result<HttpResponseDeleted, HttpError>;
-
     // Snapshots
 
     /// List snapshots
diff --git a/openapi/nexus/nexus-2026011501.0.0-81034d.json b/openapi/nexus/nexus-2026011501.0.0-81034d.json
@@ -6073,7 +6073,6 @@
           "experimental"
         ],
         "summary": "List multicast groups",
-        "description": "Prior version that included deprecated `mvlan` field and omitted `has_any_source_member`.",
         "operationId": "multicast_group_list",
         "parameters": [
           {
@@ -6133,7 +6132,7 @@
           "experimental"
         ],
         "summary": "Fetch multicast group",
-        "description": "Prior version that included deprecated `mvlan` field and omitted `has_any_source_member`.",
+        "description": "The group can be specified by name, UUID, or multicast IP address. (e.g., \"224.1.2.3\" or \"ff38::1\").",
         "operationId": "multicast_group_view",
         "parameters": [
           {
@@ -23691,7 +23690,7 @@
         ]
       },
       "PoolSelector": {
-        "description": "Specify which IP or external subnet pool to allocate from.",
+        "description": "Specify which IP pool to allocate from.",
         "oneOf": [
           {
             "description": "Use the specified pool by name or ID.",
@@ -29525,13 +29524,6 @@
         "url": "http://docs.oxide.computer/api/experimental"
       }
     },
-    {
-      "name": "external-subnets",
-      "description": "External subnets that can be attached to instances.",
-      "externalDocs": {
-        "url": "http://docs.oxide.computer/api/external-subnets"
-      }
-    },
     {
       "name": "floating-ips",
       "description": "Floating IPs allow a project to allocate well-known IPs to instances.",
@@ -29665,13 +29657,6 @@
         "url": "http://docs.oxide.computer/api/system-status"
       }
     },
-    {
-      "name": "system/subnet-pools",
-      "description": "Subnet pools are collections of IP subnets that can be assigned to silos. When a pool is linked to a silo, users in that silo can allocate external subnets from the pool.",
-      "externalDocs": {
-        "url": "http://docs.oxide.computer/api/system-subnet-pools"
-      }
-    },
     {
       "name": "system/update",
       "description": "Upload and manage system updates",
diff --git a/openapi/nexus/nexus-2026011600.0.0-4e3ad9.json b/openapi/nexus/nexus-2026011600.0.0-4e3ad9.json
@@ -6073,7 +6073,6 @@
           "experimental"
         ],
         "summary": "List multicast groups",
-        "description": "Prior version that included deprecated `mvlan` field and omitted `has_any_source_member`.",
         "operationId": "multicast_group_list",
         "parameters": [
           {
@@ -6133,7 +6132,7 @@
           "experimental"
         ],
         "summary": "Fetch multicast group",
-        "description": "Prior version that included deprecated `mvlan` field and omitted `has_any_source_member`.",
+        "description": "The group can be specified by name, UUID, or multicast IP address. (e.g., \"224.1.2.3\" or \"ff38::1\").",
         "operationId": "multicast_group_view",
         "parameters": [
           {
@@ -23691,7 +23690,7 @@
         ]
       },
       "PoolSelector": {
-        "description": "Specify which IP or external subnet pool to allocate from.",
+        "description": "Specify which IP pool to allocate from.",
         "oneOf": [
           {
             "description": "Use the specified pool by name or ID.",
@@ -29525,13 +29524,6 @@
         "url": "http://docs.oxide.computer/api/experimental"
       }
     },
-    {
-      "name": "external-subnets",
-      "description": "External subnets that can be attached to instances.",
-      "externalDocs": {
-        "url": "http://docs.oxide.computer/api/external-subnets"
-      }
-    },
     {
       "name": "floating-ips",
       "description": "Floating IPs allow a project to allocate well-known IPs to instances.",
@@ -29665,13 +29657,6 @@
         "url": "http://docs.oxide.computer/api/system-status"
       }
     },
-    {
-      "name": "system/subnet-pools",
-      "description": "Subnet pools are collections of IP subnets that can be assigned to silos. When a pool is linked to a silo, users in that silo can allocate external subnets from the pool.",
-      "externalDocs": {
-        "url": "http://docs.oxide.computer/api/system-subnet-pools"
-      }
-    },
     {
       "name": "system/update",
       "description": "Upload and manage system updates",
diff --git a/openapi/nexus/nexus-2026011601.0.0-613942.json b/openapi/nexus/nexus-2026011601.0.0-613942.json
