Make unit test more explicit that we ignore the size of the instance

Author: hgreebe

cli/src/pcluster/templates/queues_stack.py

@@ -369,37 +369,38 @@ def add_network_interfaces(
 ):
     """Generate launch template network interfaces list."""
     is_gb200 = compute_resource.instance_types[0].split(".")[0] == P6E_GB200
-    interface = "efa" if compute_resource.efa and compute_resource.efa.enabled and not is_gb200 else None
+    efa_enabled = compute_resource.efa and compute_resource.efa.enabled
+    interface_type = "efa" if efa_enabled and not is_gb200 else None
 
     compute_lt_nw_interfaces = [
         ec2.CfnLaunchTemplate.NetworkInterfaceProperty(
             device_index=0,
             network_card_index=0,
             associate_public_ip_address=queue.networking.assign_public_ip,
-            interface_type=interface,
+            interface_type=interface_type,
             groups=queue_lt_security_groups,
             subnet_id=(queue.networking.subnet_ids[0] if isinstance(compute_resource, SlurmComputeResource) else None),
         )
     ]
 
     for network_card in compute_resource.network_cards_list[1:]:
-        efa_enabled = True if compute_resource.efa and compute_resource.efa.enabled else False
         even = network_card.network_card_index() % 2 == 0
-        # if efa is disabled, and we have a gb200 instance we skip configuring odd numbered indexes
+        # if efa is disabled, and we have a gb200 instance we skip configuring odd numbered indexes because they only
+        # support efa-only interface type
         if is_gb200 and not efa_enabled and not even:
             continue
 
-        interface = "efa" if compute_resource.efa and compute_resource.efa.enabled else None
+        interface_type = "efa" if efa_enabled else None
         # if efa is enabled with a gb200 instance, even indexes are configured as efa and the odd as efa-only
         if is_gb200 and efa_enabled:
-            interface = "efa" if even else "efa-only"
+            interface_type = "efa" if even else "efa-only"
 
         compute_lt_nw_interfaces.append(
             ec2.CfnLaunchTemplate.NetworkInterfaceProperty(
                 device_index=0 if network_card.maximum_network_interfaces() == 1 else 1,
                 network_card_index=network_card.network_card_index(),
                 associate_public_ip_address=False,
-                interface_type=interface,
+                interface_type=interface_type,
                 groups=queue_lt_security_groups,
                 subnet_id=(
                     queue.networking.subnet_ids[0] if isinstance(compute_resource, SlurmComputeResource) else None

cli/tests/pcluster/templates/test_queues_stack.py

@@ -171,7 +171,7 @@ def maximum_network_interfaces(self):
     [
         (
             True,
-            "p6e-gb200.36xlarge",
+            "p6e-gb200.WHATEVER_SIZE",
             [NetworkCard(0), NetworkCard(1), NetworkCard(2, 2), NetworkCard(3), NetworkCard(4, 2)],
             [
                 {"network_card_index": 0, "interface_type": None, "device_index": 0},
@@ -183,7 +183,7 @@ def maximum_network_interfaces(self):
         ),
         (
             False,
-            "p6e-gb200.36xlarge",
+            "p6e-gb200.WHATEVER_SIZE",
             [NetworkCard(0), NetworkCard(1), NetworkCard(2, 2), NetworkCard(3), NetworkCard(4, 2)],
             [
                 {"network_card_index": 0, "interface_type": None, "device_index": 0},
@@ -193,14 +193,24 @@ def maximum_network_interfaces(self):
         ),
         (
             True,
-            "c6in.32xlarge",
+            "NOTp6e-gb200.WHATEVER_SIZE",
             [NetworkCard(0), NetworkCard(1, 2), NetworkCard(2, 2)],
             [
                 {"network_card_index": 0, "interface_type": "efa", "device_index": 0},
                 {"network_card_index": 1, "interface_type": "efa", "device_index": 1},
                 {"network_card_index": 2, "interface_type": "efa", "device_index": 1},
             ],
         ),
+        (
+            False,
+            "NOTp6e-gb200.WHATEVER_SIZE",
+            [NetworkCard(0), NetworkCard(1, 2), NetworkCard(2, 2)],
+            [
+                {"network_card_index": 0, "interface_type": None, "device_index": 0},
+                {"network_card_index": 1, "interface_type": None, "device_index": 1},
+                {"network_card_index": 2, "interface_type": None, "device_index": 1},
+            ],
+        ),
     ],
 )
 def test_add_compute_resource_launch_template(