ok fine, use ResultsPage

Author: david-crespo

nexus/src/external_api/http_entrypoints.rs

@@ -2500,7 +2500,7 @@ async fn instance_network_interface_update(
 async fn instance_external_ip_list(
     rqctx: Arc<RequestContext<Arc<ServerContext>>>,
     path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseOk<views::ExternalIps>, HttpError> {
+) -> Result<HttpResponseOk<ResultsPage<views::ExternalIp>>, HttpError> {
     let apictx = rqctx.context();
     let nexus = &apictx.nexus;
     let path = path_params.into_inner();
@@ -2517,7 +2517,7 @@ async fn instance_external_ip_list(
                 instance_name,
             )
             .await?;
-        Ok(HttpResponseOk(views::ExternalIps { items: ips }))
+        Ok(HttpResponseOk(ResultsPage { items: ips, next_page: None }))
     };
     apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
 }

nexus/src/external_api/views.rs

@@ -393,13 +393,6 @@ pub struct ExternalIp {
     pub kind: IpKind,
 }
 
-/// Unpaginated list of [`ExternalIp`]
-#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ExternalIps {
-    pub items: Vec<ExternalIp>,
-}
-
 // RACKS
 
 /// Client view of an [`Rack`]

nexus/tests/integration_tests/instances.rs

@@ -36,7 +36,7 @@ use std::sync::Arc;
 use uuid::Uuid;
 
 use dropshot::test_util::ClientTestContext;
-use dropshot::HttpErrorResponseBody;
+use dropshot::{HttpErrorResponseBody, ResultsPage};
 
 use nexus_test_utils::identity_eq;
 use nexus_test_utils::resource_helpers::{
@@ -2500,7 +2500,7 @@ async fn test_instance_ephemeral_ip_from_correct_project(
         .execute()
         .await
         .expect("Failed to fetch external IPs")
-        .parsed_body::<views::ExternalIps>()
+        .parsed_body::<ResultsPage<views::ExternalIp>>()
         .expect("Failed to parse external IPs");
     assert_eq!(ips.items.len(), 1);
     assert_eq!(ips.items[0].kind, IpKind::Ephemeral);

openapi/nexus.json

@@ -2972,7 +2972,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ExternalIps"
+                  "$ref": "#/components/schemas/ExternalIpResultsPage"
                 }
               }
             }
@@ -7257,15 +7257,21 @@
           }
         ]
       },
-      "ExternalIps": {
-        "description": "Unpaginated list of [`ExternalIp`]",
+      "ExternalIpResultsPage": {
+        "description": "A single page of results",
         "type": "object",
         "properties": {
           "items": {
+            "description": "list of items on this page of results",
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/ExternalIp"
             }
+          },
+          "next_page": {
+            "nullable": true,
+            "description": "token used to fetch the next page of results (if any)",
+            "type": "string"
           }
         },
         "required": [