Merge branch 'felixmcfelix/vpc-subnet-routing' into felixmcfelix/vpc-…

…subnets-user
oxidecomputer · May 28, 2024 · e6fe817 · e6fe817
2 parents 9c68888 + e886d16
commit e6fe817
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nexus/db-queries/src/db/datastore/vpc.rs b/nexus/db-queries/src/db/datastore/vpc.rs
@@ -1575,8 +1575,9 @@ impl DataStore {
                     .eq(subnet_dsl::custom_router_id)),
             )
             .filter(subnet_dsl::time_deleted.is_null())
-            .filter(subnet_dsl::vpc_id.is_null())
+            .filter(subnet_dsl::vpc_id.eq(vpc_id))
             .filter(router_dsl::time_deleted.is_null())
+            .filter(router_dsl::vpc_id.eq(vpc_id))
             .select((VpcSubnet::as_select(), VpcRouter::as_select()))
             .load_async(&*self.pool_connection_authorized(opctx).await?)
             .await