Fix schema migration and definitions

nexus/db-model/src/external_ip.rs

@@ -57,7 +57,6 @@ pub struct ExternalIp {
     pub time_created: DateTime<Utc>,
     pub time_modified: DateTime<Utc>,
     pub time_deleted: Option<DateTime<Utc>>,
-    pub project_id: Option<Uuid>,
     pub ip_pool_id: Option<Uuid>,
     pub ip_pool_range_id: Option<Uuid>,
     pub is_service: bool,
@@ -70,6 +69,7 @@ pub struct ExternalIp {
     pub ip: IpNetwork,
     pub first_port: SqlU16,
     pub last_port: SqlU16,
+    pub project_id: Option<Uuid>,
 }
 
 impl From<ExternalIp> for sled_agent_client::types::SourceNatConfig {

nexus/db-model/src/schema.rs

@@ -524,7 +524,6 @@ table! {
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
-        project_id -> Nullable<Uuid>,
         ip_pool_id -> Nullable<Uuid>,
         ip_pool_range_id -> Nullable<Uuid>,
         is_service -> Bool,
@@ -533,6 +532,7 @@ table! {
         ip -> Inet,
         first_port -> Int4,
         last_port -> Int4,
+        project_id -> Nullable<Uuid>,
     }
 }
 

nexus/db-queries/src/db/datastore/external_ip.rs

@@ -152,14 +152,14 @@ impl DataStore {
     pub async fn attach_floating_ip_to_instance(
         &self,
         opctx: &OpContext,
-        instance_id: Uuid,
-        ip_id: &NameOrId,
-        project: &authz::Project,
+        _instance_id: Uuid,
+        _ip_id: &NameOrId,
+        _project: &authz::Project,
     ) -> UpdateResult<ExternalIp> {
-        use db::schema::external_ip::dsl;
+        // use db::schema::external_ip::dsl;
         // TODO: scope by project
         // opctx.authorize(authz::Action::CreateChild, authz_project).await?;
-        let conn = self.pool_connection_authorized(opctx).await?;
+        let _conn = self.pool_connection_authorized(opctx).await?;
 
         // let ip_id = match ip_id {
         //     NameOrId::Id(id) => *id,

nexus/src/external_api/http_entrypoints.rs

@@ -1563,10 +1563,10 @@ async fn floating_ip_create(
         let opctx = crate::context::op_context_for_external_api(&rqctx).await?;
         let project_lookup =
             nexus.project_lookup(&opctx, query_params.into_inner())?;
-        let pool = nexus
+        let ip = nexus
             .create_floating_ip(&opctx, &project_lookup, &floating_params)
             .await?;
-        Ok(HttpResponseCreated(views::ExternalIp::from(pool)))
+        Ok(HttpResponseCreated(views::ExternalIp::from(ip)))
     };
     apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
 }

schema/crdb/14.0.0/up02.sql

@@ -1,3 +1,3 @@
-ALTER TABLE omicron.public.external_ip ADD CONSTRAINT null_project_id IF NOT EXISTS CHECK (
+ALTER TABLE omicron.public.external_ip ADD CONSTRAINT IF NOT EXISTS null_project_id CHECK (
 	kind = 'floating' OR project_id IS NULL
 );

schema/crdb/14.0.0/up03.sql

@@ -1,3 +1,3 @@
-ALTER TABLE omicron.public.external_ip ADD CONSTRAINT null_non_fip_pool_id IF NOT EXISTS CHECK (
+ALTER TABLE omicron.public.external_ip ADD CONSTRAINT IF NOT EXISTS null_non_fip_pool_id CHECK (
 	kind = 'floating' OR (ip_pool_id IS NOT NULL AND ip_pool_range_id IS NOT NULL)
 );

schema/crdb/14.0.0/up04.sql

@@ -1,4 +1,4 @@
-ALTER TABLE omicron.public.external_ip ADD CONSTRAINT null_pool_range_id IF NOT EXISTS CHECK (
+ALTER TABLE omicron.public.external_ip ADD CONSTRAINT IF NOT EXISTS null_pool_range_id CHECK (
 	(ip_pool_id IS NULL AND ip_pool_range_id IS NULL) OR
     (ip_pool_id IS NOT NULL AND ip_pool_range_id IS NOT NULL)
 );

schema/crdb/dbinit.sql

@@ -1578,9 +1578,6 @@ CREATE TABLE IF NOT EXISTS omicron.public.external_ip (
     time_modified TIMESTAMPTZ NOT NULL,
     time_deleted TIMESTAMPTZ,
 
-    /* FK to the `ip_pool` table. */
-    project_id UUID,
-
     /* FK to the `ip_pool` table. */
     ip_pool_id UUID,
 
@@ -1605,6 +1602,9 @@ CREATE TABLE IF NOT EXISTS omicron.public.external_ip (
     /* The last port in the allowed range, also inclusive. */
     last_port INT4 NOT NULL,
 
+    /* FK to the `ip_pool` table. */
+    project_id UUID,
+
     /* The name must be non-NULL iff this is a floating IP. */
     CONSTRAINT null_fip_name CHECK (
         (kind != 'floating' AND name IS NULL) OR