Add suppport for m6a, m7i, m6in, m5zn families; also correct hugepage… (

#19) * Add suppport for m6a, m7i, m6in, m5zn families; also correct hugepage allocation for cloud router use cases on 2xlarge instances * Fix typ in m7 instance specification and also fix up UT test case * Fix up comment --------- Co-authored-by: Jon moon <[email protected]>
ios-xr · Mar 13, 2024 · ffbda0d · ffbda0d
1 parent 181c662
commit ffbda0d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/modules/aws/node-props/main.tf b/modules/aws/node-props/main.tf
@@ -3,12 +3,12 @@ locals {
     "cloud-router" = {
       "m5.2xlarge" = {
         cpuset       = "2-3"
-        hugepages_gb = 4
+        hugepages_gb = 6
       }
 
       "m5n.2xlarge" = {
         cpuset       = "2-3"
-        hugepages_gb = 4
+        hugepages_gb = 6
       }
 
       "m5.24xlarge" = {
@@ -35,6 +35,27 @@ locals {
       "m5n.16xlarge",
       "m5n.24xlarge",
     ]
+
+    m5zn = [
+      "m5zn.12xlarge",
+    ]
+
+    m6in = [
+      # m6in.16xlarge is confirmed single NUMA (different from m5n family)
+      "m6in.24xlarge",
+      "m6in.32xlarge",
+    ]
+
+    m6a = [
+      # m6a.24xlarge" confirmed as single NUMA
+      "m6a.32xlarge",
+      "m6a.48xlarge",
+    ]
+
+    m7i = [
+      # m7i.24xlarge confirmed as single NUMA
+      "m7i.48xlarge",
+    ]
   }
 }
 

diff --git a/tests/ut/test_node.py b/tests/ut/test_node.py
@@ -243,7 +243,7 @@ def test_unknown_instance_type(ec2, tf: Terraform, base_vars: dict[str, Any]):
     unknown instance type.
 
     """
-    vars = base_vars | {"instance_type": "m7i.48xlarge", "is_xrd_ami": True}
+    vars = base_vars | {"instance_type": "m1.small", "is_xrd_ami": True}
     with pytest.raises(subprocess.CalledProcessError) as excinfo:
         tf.apply(vars=vars)
         assert "Isolated cores was not provided" in str(excinfo.value)