Skip to content

Commit e9c8a21

Browse files
committed
[Test] Remove unnecessary assertion on shared storage security groups which is covered by unit test.
1 parent 822fc58 commit e9c8a21

File tree

1 file changed

+0
-50
lines changed

1 file changed

+0
-50
lines changed

tests/integration-tests/tests/networking/test_security_groups.py

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,6 @@ def test_overwrite_sg(region, scheduler, custom_security_groups, pcluster_config
114114
"allowing all traffic to itself and to the custom security group"
115115
)
116116
assert_that(fsx_security_groups).is_length(1)
117-
fsx_security_group = fsx_security_groups[0]
118-
fsx_security_group_id = fsx_security_group["GroupId"]
119-
120-
_assert_security_group_rules(
121-
ec2_client,
122-
fsx_security_group_id,
123-
[fsx_security_group_id, custom_security_group_id],
124-
shared_storage_type="fsx",
125-
)
126117

127118
logging.info("Collecting security groups of the EFS")
128119
efs_id = cluster.cfn_resources[f"EFS{create_hash_suffix(efs_name)}"]
@@ -140,13 +131,6 @@ def test_overwrite_sg(region, scheduler, custom_security_groups, pcluster_config
140131
"SecurityGroups"
141132
]
142133
assert_that(mount_target_security_groups).is_length(1)
143-
mount_target_security_group_id = mount_target_security_groups[0]
144-
_assert_security_group_rules(
145-
ec2_client,
146-
mount_target_security_group_id,
147-
[mount_target_security_group_id, custom_security_group_id],
148-
shared_storage_type="efs",
149-
)
150134

151135
if scheduler == "slurm":
152136
logging.info("Checking SSH connection between cluster nodes before cluster update")
@@ -399,37 +383,3 @@ def _get_load_balancer_by_security_group(elb_client, security_group_id):
399383
if security_group_id in load_balancer["SecurityGroups"]:
400384
load_balancers.append(load_balancer)
401385
return load_balancers
402-
403-
404-
def _assert_security_group_rules(
405-
ec2_client, security_group_id: str, referenced_security_group_ids: list, shared_storage_type: str
406-
):
407-
"""
408-
Assert security group rules for shared storage.
409-
410-
Expected rules:
411-
- EFS:
412-
- ingress: rule(2049) * (customSG) + rule(all) * (storage) = 2 rules
413-
- egress: rule(all_traffic) * (customSG + storage) = 2 rule
414-
- FSx:
415-
- ingress: rule(988,1018-1023) * (customSG) + rule(all) * (storage) = 3 rules
416-
- egress: rule(all_traffic) * (customSG + storage) = 2 rule
417-
"""
418-
rules = ec2_client.describe_security_group_rules(Filters=[{"Name": "group-id", "Values": [security_group_id]}])[
419-
"SecurityGroupRules"
420-
]
421-
422-
egress_rules = [rule for rule in rules if rule["IsEgress"]]
423-
ingress_rules = [rule for rule in rules if not rule["IsEgress"]]
424-
425-
if shared_storage_type == "efs":
426-
assert_that(ingress_rules).is_length(2)
427-
assert_that(egress_rules).is_length(2)
428-
elif shared_storage_type == "fsx":
429-
assert_that(ingress_rules).is_length(3)
430-
assert_that(egress_rules).is_length(2)
431-
432-
# Verify ingress rules reference the expected security groups
433-
for sg_id in referenced_security_group_ids:
434-
match = [rule for rule in ingress_rules if rule.get("ReferencedGroupInfo", {}).get("GroupId") == sg_id]
435-
assert_that(match).is_length(1)

0 commit comments

Comments
 (0)