hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-05 18:11:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[autoscaler] Custom AWS network interface error condition tests and missing security group bug fix. (#17207)

Browse source
This commit is contained in:
Patrick Ames 2021-07-20 11:17:27 -07:00 • committed by GitHub
parent 492076806d
commit efed07023f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
python/ray/autoscaler/_private/aws/config.py
View file

@ -782,19 +782,21 @@ def _configure_subnets_and_groups_from_network_interfaces(node_cfg):
conflict_keys = ["SubnetId", "SubnetIds", "SecurityGroupIds"]
if any(conflict in node_cfg for conflict in conflict_keys):
raise ValueError(
"If NetworkInterfaces are defined, subnets and security groups"
"If NetworkInterfaces are defined, subnets and security groups "
"must ONLY be given in each NetworkInterface.")
if not all(_subnets_in_network_config(node_cfg)):
subnets = _subnets_in_network_config(node_cfg)
if not all(subnets):
raise ValueError(
"NetworkInterfaces are defined but at least one is missing a "
"subnet. Please ensure all interfaces have a subnet assigned.")
if not all(_security_groups_in_network_config(node_cfg)):
security_groups = _security_groups_in_network_config(node_cfg)
if not all(security_groups):
raise ValueError(
"NetworkInterfaces are defined but at least one is missing a "
"security group. Please ensure all interfaces have a security "
"group assigned.")
node_cfg["SubnetIds"] = _subnets_in_network_config(node_cfg)
node_cfg["SecurityGroupIds"] = _security_groups_in_network_config(node_cfg)
node_cfg["SubnetIds"] = subnets
node_cfg["SecurityGroupIds"] = list(itertools.chain(*security_groups))
def _subnets_in_network_config(config):
@ -804,10 +806,7 @@ def _subnets_in_network_config(config):
def _security_groups_in_network_config(config):
lists = [
ni.get("Groups", []) for ni in config.get("NetworkInterfaces", [])
]
return list(itertools.chain(*lists))
return [ni.get("Groups", []) for ni in config.get("NetworkInterfaces", [])]
def _client(name, config):

50
python/ray/tests/aws/test_autoscaler_aws.py
View file

@ -524,6 +524,56 @@ def test_network_interfaces(ec2_client_stub, iam_client_stub,
ec2_client_stub_max_retries.assert_no_pending_responses()
def test_network_interface_conflict_keys():
# If NetworkInterfaces are defined, SubnetId and SecurityGroupIds
# can't be specified in the same node type config.
conflict_kv_pairs = [("SubnetId", "subnet-0000000"),
("SubnetIds", ["subnet-0000000", "subnet-1111111"]),
("SecurityGroupIds", ["sg-1234abcd", "sg-dcba4321"])]
expected_error_msg = "If NetworkInterfaces are defined, subnets and " \
"security groups must ONLY be given in each " \
"NetworkInterface."
for conflict_kv_pair in conflict_kv_pairs:
config = helpers.load_aws_example_config_file(
"example-network-interfaces.yaml")
head_name = config["head_node_type"]
head_node_cfg = config["available_node_types"][head_name][
"node_config"]
head_node_cfg[conflict_kv_pair[0]] = conflict_kv_pair[1]
with pytest.raises(ValueError, match=expected_error_msg):
helpers.bootstrap_aws_config(config)
def test_network_interface_missing_subnet():
# If NetworkInterfaces are defined, each must have a subnet ID
expected_error_msg = "NetworkInterfaces are defined but at least one is " \
"missing a subnet. Please ensure all interfaces " \
"have a subnet assigned."
config = helpers.load_aws_example_config_file(
"example-network-interfaces.yaml")
for name, node_type in config["available_node_types"].items():
node_cfg = node_type["node_config"]
for network_interface_cfg in node_cfg["NetworkInterfaces"]:
network_interface_cfg.pop("SubnetId")
with pytest.raises(ValueError, match=expected_error_msg):
helpers.bootstrap_aws_config(config)
def test_network_interface_missing_security_group():
# If NetworkInterfaces are defined, each must have security groups
expected_error_msg = "NetworkInterfaces are defined but at least one is " \
"missing a security group. Please ensure all " \
"interfaces have a security group assigned."
config = helpers.load_aws_example_config_file(
"example-network-interfaces.yaml")
for name, node_type in config["available_node_types"].items():
node_cfg = node_type["node_config"]
for network_interface_cfg in node_cfg["NetworkInterfaces"]:
network_interface_cfg.pop("Groups")
with pytest.raises(ValueError, match=expected_error_msg):
helpers.bootstrap_aws_config(config)
if __name__ == "__main__":
import sys
sys.exit(pytest.main(["-v", __file__]))