Adjust some quotas in hopes of not failing all the tests

oxidecomputer · Dec 7, 2023 · 2ee6d36 · 2ee6d36
1 parent 55ff0b2
commit 2ee6d36
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/nexus/db-queries/src/db/datastore/rack.rs b/nexus/db-queries/src/db/datastore/rack.rs
@@ -874,7 +874,7 @@ mod test {
     };
     use omicron_common::api::external::http_pagination::PaginatedBy;
     use omicron_common::api::external::{
-        IdentityMetadataCreateParams, MacAddr,
+        ByteCount, IdentityMetadataCreateParams, MacAddr,
     };
     use omicron_common::api::internal::shared::SourceNatConfig;
     use omicron_common::nexus_config::NUM_INITIAL_RESERVED_IP_ADDRESSES;
@@ -912,7 +912,11 @@ mod test {
                         name: "test-silo".parse().unwrap(),
                         description: String::new(),
                     },
-                    quotas: external_params::SiloQuotasCreate::empty(),
+                    quotas: external_params::SiloQuotasCreate {
+                        cpus: 128,
+                        memory: ByteCount::from_gibibytes_u32(1000),
+                        storage: ByteCount::from_gibibytes_u32(1000000),
+                    },
                     discoverable: false,
                     identity_mode: SiloIdentityMode::LocalOnly,
                     admin_group_name: None,

diff --git a/nexus/db-queries/src/db/fixed_data/silo.rs b/nexus/db-queries/src/db/fixed_data/silo.rs
@@ -5,7 +5,7 @@
 use crate::db;
 use lazy_static::lazy_static;
 use nexus_types::external_api::{params, shared};
-use omicron_common::api::external::IdentityMetadataCreateParams;
+use omicron_common::api::external::{ByteCount, IdentityMetadataCreateParams};
 
 lazy_static! {
     pub static ref SILO_ID: uuid::Uuid = "001de000-5110-4000-8000-000000000000"
@@ -24,8 +24,11 @@ lazy_static! {
                     name: "default-silo".parse().unwrap(),
                     description: "default silo".to_string(),
                 },
-                // TODO: Should the default silo have a quota? If so, what should the defaults be?
-                quotas: params::SiloQuotasCreate::empty(),
+                quotas: params::SiloQuotasCreate {
+                    cpus: 128,
+                    memory: ByteCount::from_gibibytes_u32(1000),
+                    storage: ByteCount::from_gibibytes_u32(1000000),
+                },
                 discoverable: false,
                 identity_mode: shared::SiloIdentityMode::LocalOnly,
                 admin_group_name: None,

diff --git a/nexus/test-utils/src/resource_helpers.rs b/nexus/test-utils/src/resource_helpers.rs
@@ -263,9 +263,9 @@ pub async fn create_silo(
                 description: "a silo".to_string(),
             },
             quotas: params::SiloQuotasCreate {
-                cpus: 36,
+                cpus: 128,
                 memory: ByteCount::from_gibibytes_u32(1000),
-                storage: ByteCount::from_gibibytes_u32(100000),
+                storage: ByteCount::from_gibibytes_u32(1000000),
             },
             discoverable,
             identity_mode,

diff --git a/nexus/tests/integration_tests/endpoints.rs b/nexus/tests/integration_tests/endpoints.rs
@@ -93,8 +93,8 @@ lazy_static! {
             },
             quotas: params::SiloQuotasCreate {
                 cpus: 100,
-                memory: ByteCount::from_gibibytes_u32(100),
-                storage: ByteCount::from_gibibytes_u32(100),
+                memory: ByteCount::from_gibibytes_u32(1000),
+                storage: ByteCount::from_gibibytes_u32(100000),
             },
             discoverable: true,
             identity_mode: shared::SiloIdentityMode::SamlJit,