test(api-db): Move DB-only API tests from api-core into api-db (#2652)

- Moves DB-only tests out of api-core and into the owning api-db
modules.
- Covers domain creation, rack/switch/power shelf metadata, machine
interface IP allocation, machine interface address lookup, and duplicate
MAC handling.
- Adds api-db::test_support::network_segment::admin_segment for shared
DB test fixture setup.
- Removes TestEnv/API harness usage from these tests where direct DB
setup is enough.

## Related issues

#2001 

## Type of Change
- [ ] **Add** - New feature or capability
- [ ] **Change** - Changes in existing functionality
- [ ] **Fix** - Bug fixes
- [ ] **Remove** - Removed features or deprecated functionality
- [x] **Internal** - Internal changes (refactoring, tests, docs, etc.)

## Breaking Changes
- [ ] **This PR contains breaking changes**

## Testing
- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Manual testing performed
- [x] No testing required (docs, internal refactor, etc.)

## Additional Notes

---------

Signed-off-by: Dmitry Porokh <dporokh@nvidia.com>

Author: poroh

crates/api-core/src/tests/mod.rs

@@ -20,7 +20,6 @@ mod client_resolution;
 pub mod common;
 mod compute_allocation;
 mod connected_device;
-mod create_domain;
 mod credential;
 mod dhcp_lease_expiration;
 mod dns;
@@ -57,7 +56,6 @@ mod instance_find;
 mod instance_ipxe_behaviors;
 mod instance_os;
 mod instance_type;
-mod ip_allocator;
 mod ipxe;
 mod level_filter;
 mod lldp;
@@ -70,7 +68,6 @@ mod machine_discovery;
 mod machine_find;
 mod machine_health;
 mod machine_history;
-mod machine_interface_addresses;
 mod machine_interfaces;
 mod machine_metadata;
 mod machine_network;
@@ -96,13 +93,10 @@ mod operating_system;
 mod power_shelf;
 mod power_shelf_find;
 mod power_shelf_health;
-mod power_shelf_metadata;
 mod power_shelf_state_controller;
 mod preingestion_dpu_nic_mode;
-mod prevent_duplicate_mac_addresses;
 mod rack_find;
 mod rack_health;
-mod rack_metadata;
 mod rack_state_controller;
 mod redfish_actions;
 mod resource_pool;
@@ -118,7 +112,6 @@ mod storage;
 mod switch;
 mod switch_find;
 mod switch_health;
-mod switch_metadata;
 mod switch_state_controller;
 mod tenant_keyset_find;
 mod tenants;

crates/api-db/src/dns/domain.rs

@@ -27,6 +27,9 @@ use super::super::{ColumnInfo, FilterableQueryBuilder, ObjectColumnFilter};
 use crate::db_read::DbReader;
 use crate::{DatabaseError, DatabaseResult};
 
+#[cfg(test)]
+mod test_create_domain;
+
 /// Validates a domain name according to DNS standards
 fn validate_domain_name(name: &str) -> Result<(), DatabaseError> {
     if name != name.to_lowercase() {

…ates/api-core/src/tests/create_domain.rs …-db/src/dns/domain/test_create_domain.rscrates/api-core/src/tests/create_domain.rs renamed to crates/api-db/src/dns/domain/test_create_domain.rs crates/api-core/src/tests/create_domain.rs renamed to crates/api-db/src/dns/domain/test_create_domain.rs

@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 use db::ObjectColumnFilter;
 use model::dns::NewDomain;
 
+use crate as db;
 use crate::DatabaseError;
 
 #[crate::sqlx_test]

crates/api-db/src/lib.rs

@@ -96,6 +96,9 @@ pub mod vpc_peering;
 pub mod vpc_prefix;
 pub mod work_lock_manager;
 
+#[cfg(test)]
+mod test_support;
+
 use std::backtrace::{Backtrace, BacktraceStatus};
 use std::error::Error;
 use std::fmt::{Display, Formatter};

crates/api-db/src/machine_interface.rs

@@ -95,6 +95,10 @@ impl ColumnInfo<'_> for IdColumn {
     }
 }
 
+#[cfg(test)]
+mod ip_allocator;
+#[cfg(test)]
+mod test_duplicate_mac;
 #[cfg(test)]
 mod tests;
 

crates/api-core/src/tests/ip_allocator.rs …db/src/machine_interface/ip_allocator.rscrates/api-core/src/tests/ip_allocator.rs renamed to crates/api-db/src/machine_interface/ip_allocator.rs crates/api-core/src/tests/ip_allocator.rs renamed to crates/api-db/src/machine_interface/ip_allocator.rs

@@ -19,29 +19,33 @@ use std::str::FromStr;
 
 use mac_address::MacAddress;
 use model::address_selection_strategy::AddressSelectionStrategy;
+use model::dns::{Domain, NewDomain};
 use model::network_prefix::NewNetworkPrefix;
 use model::network_segment::{
     AllocationStrategy, NetworkSegmentControllerState, NetworkSegmentType, NewNetworkSegment,
 };
 
-use crate::tests::common::api_fixtures::{
-    TestEnvOverrides, create_test_env, create_test_env_with_overrides,
-};
+use crate as db;
+use crate::test_support::network_segment::admin_segment;
+
+async fn init_dwrt1_domain(txn: &mut sqlx::PgTransaction<'_>) -> db::DatabaseResult<Domain> {
+    db::dns::domain::persist(NewDomain::new("dwrt1.com"), txn.as_mut()).await
+}
 
 /// Test that machine_interface::create allocates the correct IPv4 address
 /// from the admin segment (192.0.2.0/24 with num_reserved=3, gateway=.1).
 #[crate::sqlx_test]
 async fn test_machine_interface_create_with_ipv4_prefix(
     pool: sqlx::PgPool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env(pool).await;
-    let mut txn = env.pool.begin().await?;
-
-    let network_segment = db::network_segment::admin(&mut txn)
-        .await?
-        .into_iter()
-        .next()
-        .unwrap();
+    let mut txn = pool.begin().await?;
+
+    let network_segment = db::network_segment::persist(
+        admin_segment("ADMIN_TEST", "192.0.2.0/24", "192.0.2.1", 3),
+        &mut txn,
+        NetworkSegmentControllerState::Ready,
+    )
+    .await?;
     let network_prefix = network_segment
         .prefixes
         .first()
@@ -111,36 +115,17 @@ async fn test_machine_interface_create_with_ipv4_prefix(
 async fn test_machine_interface_create_falls_through_admin_segments(
     pool: sqlx::PgPool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env_with_overrides(pool, TestEnvOverrides::no_network_segments()).await;
-    let mut txn = env.pool.begin().await?;
-
-    let admin_segment = |name: &str, prefix: &str, gateway: &str| NewNetworkSegment {
-        name: name.to_string(),
-        subdomain_id: None,
-        vpc_id: None,
-        mtu: 1500,
-        prefixes: vec![NewNetworkPrefix {
-            prefix: prefix.parse().unwrap(),
-            gateway: Some(gateway.parse().unwrap()),
-            num_reserved: 2,
-        }],
-        vlan_id: None,
-        vni: None,
-        segment_type: NetworkSegmentType::Admin,
-        id: uuid::Uuid::new_v4().into(),
-        can_stretch: None,
-        allocation_strategy: AllocationStrategy::Dynamic,
-    };
+    let mut txn = pool.begin().await?;
 
     // Create two tiny admin segments with one allocatable address each.
     let first_segment = db::network_segment::persist(
-        admin_segment("ADMIN_TINY_1", "192.0.20.0/30", "192.0.20.1"),
+        admin_segment("ADMIN_TINY_1", "192.0.20.0/30", "192.0.20.1", 2),
         &mut txn,
         NetworkSegmentControllerState::Ready,
     )
     .await?;
     let second_segment = db::network_segment::persist(
-        admin_segment("ADMIN_TINY_2", "192.0.21.0/30", "192.0.21.1"),
+        admin_segment("ADMIN_TINY_2", "192.0.21.0/30", "192.0.21.1", 2),
         &mut txn,
         NetworkSegmentControllerState::Ready,
     )
@@ -178,7 +163,7 @@ async fn test_machine_interface_create_falls_through_admin_segments(
     txn.commit().await?;
 
     // Re-read the second interface to verify the persisted segment and address.
-    let mut txn = env.pool.begin().await?;
+    let mut txn = pool.begin().await?;
     let persisted_interface =
         db::machine_interface::find_one(txn.as_mut(), second_interface_id).await?;
     assert_eq!(persisted_interface.segment_id, second_segment.id);
@@ -195,14 +180,8 @@ async fn test_machine_interface_create_falls_through_admin_segments(
 async fn test_machine_interface_create_with_ipv6_prefix(
     pool: sqlx::PgPool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env(pool).await;
-    let mut txn = env.pool.begin().await?;
-
-    let domain = db::dns::domain::find_by_name(txn.as_mut(), "dwrt1.com")
-        .await?
-        .into_iter()
-        .next()
-        .unwrap();
+    let mut txn = pool.begin().await?;
+    let domain = init_dwrt1_domain(&mut txn).await?;
 
     // Create an underlay segment with only an IPv6 prefix
     let new_ns = NewNetworkSegment {
@@ -278,14 +257,8 @@ async fn test_machine_interface_create_with_ipv6_prefix(
 async fn test_machine_interface_create_dual_stack(
     pool: sqlx::PgPool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env(pool).await;
-    let mut txn = env.pool.begin().await?;
-
-    let domain = db::dns::domain::find_by_name(txn.as_mut(), "dwrt1.com")
-        .await?
-        .into_iter()
-        .next()
-        .unwrap();
+    let mut txn = pool.begin().await?;
+    let domain = init_dwrt1_domain(&mut txn).await?;
 
     let new_ns = NewNetworkSegment {
         name: "DUAL-STACK-TEST".to_string(),

…tests/prevent_duplicate_mac_addresses.rs …/machine_interface/test_duplicate_mac.rscrates/api-core/src/tests/prevent_duplicate_mac_addresses.rs renamed to crates/api-db/src/machine_interface/test_duplicate_mac.rs crates/api-core/src/tests/prevent_duplicate_mac_addresses.rs renamed to crates/api-db/src/machine_interface/test_duplicate_mac.rs

@@ -14,49 +14,56 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use db::{self, ObjectColumnFilter, network_segment};
+
+use std::str::FromStr;
+
+use carbide_uuid::machine::{MachineId, MachineIdSource, MachineType};
+use mac_address::MacAddress;
 use model::address_selection_strategy::AddressSelectionStrategy;
-use model::machine::machine_id::from_hardware_info;
+use model::network_segment::NetworkSegmentControllerState;
 
+use crate as db;
 use crate::DatabaseError;
-use crate::tests::common::api_fixtures::create_test_env;
+use crate::test_support::network_segment::admin_segment;
+
+fn test_machine_id() -> MachineId {
+    MachineId::new(
+        MachineIdSource::ProductBoardChassisSerial,
+        [0x42; 32],
+        MachineType::Dpu,
+    )
+}
 
 #[crate::sqlx_test]
 async fn prevent_duplicate_mac_addresses(
     pool: sqlx::PgPool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env(pool).await;
-    let host_config = env.managed_host_config();
-    let dpu = host_config.get_and_assert_single_dpu();
-
-    let mut txn = env.pool.begin().await?;
-
-    let network_segment = db::network_segment::find_by(
-        txn.as_mut(),
-        ObjectColumnFilter::One(network_segment::IdColumn, env.admin_segment_ref()),
-        model::network_segment::NetworkSegmentSearchConfig::default(),
+    let mut txn = pool.begin().await?;
+    let network_segment = db::network_segment::persist(
+        admin_segment("ADMIN_TEST", "192.0.2.0/24", "192.0.2.1", 3),
+        &mut txn,
+        NetworkSegmentControllerState::Ready,
     )
-    .await?
-    .pop()
-    .unwrap();
+    .await?;
+    let mac_address = MacAddress::from_str("52:54:00:12:34:56").unwrap();
 
     let new_interface = db::machine_interface::create(
         &mut txn,
         std::slice::from_ref(&network_segment),
-        &dpu.oob_mac_address,
+        &mac_address,
         true,
         AddressSelectionStrategy::NextAvailableIp,
         None,
     )
     .await?;
 
-    let machine_id = from_hardware_info(&dpu.into()).unwrap();
+    let machine_id = test_machine_id();
     db::machine::get_or_create(&mut txn, None, &machine_id, &new_interface).await?;
 
     let duplicate_interface = db::machine_interface::create(
         &mut txn,
         std::slice::from_ref(&network_segment),
-        &dpu.oob_mac_address,
+        &mac_address,
         true,
         AddressSelectionStrategy::NextAvailableIp,
         None,

crates/api-db/src/machine_interface_address.rs

@@ -27,6 +27,9 @@ use sqlx::{FromRow, PgConnection};
 use super::DatabaseError;
 use crate::db_read::DbReader;
 
+#[cfg(test)]
+mod test_find_by_address;
+
 /// Returned by allocation paths with `AddressSelectionStrategy::StaticAddress`
 /// when the target IP is already held by some other interface.
 #[derive(thiserror::Error, Debug)]

…src/tests/machine_interface_addresses.rs …nterface_address/test_find_by_address.rscrates/api-core/src/tests/machine_interface_addresses.rs renamed to crates/api-db/src/machine_interface_address/test_find_by_address.rs crates/api-core/src/tests/machine_interface_addresses.rs renamed to crates/api-db/src/machine_interface_address/test_find_by_address.rs

@@ -21,26 +21,25 @@ use std::str::FromStr;
 use ipnetwork::IpNetwork;
 use mac_address::MacAddress;
 use model::address_selection_strategy::AddressSelectionStrategy;
+use model::dns::{Domain, NewDomain};
 use model::network_prefix::NewNetworkPrefix;
 use model::network_segment::{
     NetworkSegmentControllerState, NetworkSegmentType, NewNetworkSegment,
 };
 
-use crate::tests::common::api_fixtures::create_test_env;
+use crate as db;
+
+async fn init_dwrt1_domain(txn: &mut sqlx::PgTransaction<'_>) -> db::DatabaseResult<Domain> {
+    db::dns::domain::persist(NewDomain::new("dwrt1.com"), txn.as_mut()).await
+}
 
 #[crate::sqlx_test]
 async fn find_by_address_bmc(pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {
-    let env = create_test_env(pool).await;
-    let mut txn = env.pool.begin().await?;
-    let domain = db::dns::domain::find_by_name(txn.as_mut(), "dwrt1.com")
-        .await?
-        .into_iter()
-        .next()
-        .unwrap();
+    let mut txn = pool.begin().await?;
+    let domain = init_dwrt1_domain(&mut txn).await?;
 
     let new_ns = NewNetworkSegment {
         name: "PDX01-M01-H14-IPMITOR-01".to_string(),
-        // domain id from tests/fixtures/create_domain.sql
         subdomain_id: Some(domain.id),
         vpc_id: None,
         mtu: 1490,

crates/api-db/src/power_shelf.rs

@@ -33,6 +33,9 @@ use crate::{
     ColumnInfo, DatabaseError, DatabaseResult, FilterableQueryBuilder, ObjectColumnFilter,
 };
 
+#[cfg(test)]
+mod test_metadata;
+
 #[derive(Debug, Clone, Default)]
 pub struct PowerShelfSearchConfig {
     // pub include_history: bool, // unused