From 1b236731d947bfd08ce7d36217689b1d0545c498 Mon Sep 17 00:00:00 2001
From: Justin Bennett <oxide@just-be.dev>
Date: Mon, 7 Aug 2023 10:25:06 -0400
Subject: [PATCH] Update resource limits as per #3212 (#3819)

---
 nexus/src/app/mod.rs                   | 6 +++---
 nexus/tests/integration_tests/disks.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nexus/src/app/mod.rs b/nexus/src/app/mod.rs
index 801eb8d2f4..99ed75f14b 100644
--- a/nexus/src/app/mod.rs
+++ b/nexus/src/app/mod.rs
@@ -78,13 +78,13 @@ pub(crate) const MAX_NICS_PER_INSTANCE: usize = 8;
 // TODO-completeness: Support multiple external IPs
 pub(crate) const MAX_EXTERNAL_IPS_PER_INSTANCE: usize = 1;
 
-pub const MAX_VCPU_PER_INSTANCE: u16 = 32;
+pub const MAX_VCPU_PER_INSTANCE: u16 = 64;
 
 pub const MIN_MEMORY_BYTES_PER_INSTANCE: u32 = 1 << 30; // 1 GiB
-pub const MAX_MEMORY_BYTES_PER_INSTANCE: u64 = 64 * (1 << 30); // 64 GiB
+pub const MAX_MEMORY_BYTES_PER_INSTANCE: u64 = 256 * (1 << 30); // 256 GiB
 
 pub const MIN_DISK_SIZE_BYTES: u32 = 1 << 30; // 1 GiB
-pub const MAX_DISK_SIZE_BYTES: u64 = 1 << 40; // 1 TiB
+pub const MAX_DISK_SIZE_BYTES: u64 = 1023 * (1 << 30); // 1023 GiB
 
 /// Manages an Oxide fleet -- the heart of the control plane
 pub struct Nexus {
diff --git a/nexus/tests/integration_tests/disks.rs b/nexus/tests/integration_tests/disks.rs
index 2726001f38..85174a74ab 100644
--- a/nexus/tests/integration_tests/disks.rs
+++ b/nexus/tests/integration_tests/disks.rs
@@ -849,7 +849,7 @@ async fn test_disk_reject_total_size_not_divisible_by_block_size(
 
 // Tests that a disk is rejected if the total size is less than MIN_DISK_SIZE
 #[nexus_test]
-async fn test_disk_reject_total_size_less_than_one_gibibyte(
+async fn test_disk_reject_total_size_less_than_min_disk_size_bytes(
     cptestctx: &ControlPlaneTestContext,
 ) {
     let client = &cptestctx.external_client;
@@ -891,7 +891,7 @@ async fn test_disk_reject_total_size_less_than_one_gibibyte(
 }
 
 #[nexus_test]
-async fn test_disk_reject_total_size_greater_than_one_tebibyte(
+async fn test_disk_reject_total_size_greater_than_max_disk_size_bytes(
     cptestctx: &ControlPlaneTestContext,
 ) {
     let client = &cptestctx.external_client;