Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EC2: Fix us-west-1 availability zones to b and c #7604

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+54 −54
Draft

EC2: Fix us-west-1 availability zones to b and c #7604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7e6a6
EC2: Fix us-west-1 availability zones to b and c
sannya-singal Apr 17, 2024
b23aa8d
comment the part where we change azs for ec2 instances
sannya-singal Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions moto/ec2/models/availability_zones_and_regions.py
View file
Open in desktop
Expand Up @@ -252,8 +252,8 @@ class RegionsAndZonesBackend:
Zone(region_name="us-east-2", name="us-east-2c", zone_id="use2-az3"),
],
"us-west-1": [
Zone(region_name="us-west-1", name="us-west-1a", zone_id="usw1-az3"),
Zone(region_name="us-west-1", name="us-west-1b", zone_id="usw1-az1"),
Zone(region_name="us-west-1", name="us-west-1b", zone_id="usw1-az3"),
Zone(region_name="us-west-1", name="us-west-1c", zone_id="usw1-az1"),
],
"us-west-2": [
Zone(region_name="us-west-2", name="us-west-2a", zone_id="usw2-az2"),
Expand Down
12 changes: 6 additions & 6 deletions scripts/ec2_get_instance_type_offerings.py
View file
Open in desktop
Expand Up @@ -64,12 +64,12 @@ def main():
if region == "us-west-1" and location_type == "availability-zone":
zones = set([i["Location"] for i in instances])
if zones == {"us-west-1b", "us-west-1c"}:
for i in instances:
if i["Location"] == "us-west-1b":
i["Location"] = "us-west-1a"
for i in instances:
if i["Location"] == "us-west-1c":
i["Location"] = "us-west-1b"
# for i in instances:
# if i["Location"] == "us-west-1b":
# i["Location"] = "us-west-1a"
# for i in instances:
# if i["Location"] == "us-west-1c":
# i["Location"] = "us-west-1b"

print("Writing data to {0}".format(dest))
with open(dest, "w+") as open_file:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_autoscaling/test_autoscaling.py
View file
Open in desktop
Expand Up @@ -171,7 +171,7 @@
"LaunchTemplateName": launch_template_name,
"Version": "$Latest",
},
AvailabilityZones=["us-west-1a"],
AvailabilityZones=["us-west-1b"],
)

response = asg_client.describe_auto_scaling_groups(AutoScalingGroupNames=["name"])[
Expand Down Expand Up @@ -205,7 +205,7 @@
"LaunchTemplateName": launch_template_name,
"Version": "$Default",
},
AvailabilityZones=["us-west-1a"],
AvailabilityZones=["us-west-1b"],
)

response = asg_client.describe_auto_scaling_groups(AutoScalingGroupNames=["name"])[
Expand All @@ -231,7 +231,7 @@
MinSize=1,
MaxSize=1,
LaunchTemplate={"LaunchTemplateName": launch_template_name},
AvailabilityZones=["us-west-1a"],
AvailabilityZones=["us-west-1b"],
)

response = asg_client.describe_auto_scaling_groups(AutoScalingGroupNames=["name"])[
Expand Down Expand Up @@ -728,7 +728,7 @@

@mock_aws
def test_create_autoscaling_policy_with_policytype__targettrackingscaling():
mocked_networking = setup_networking(region_name="us-west-1")

Check failure on line 731 in tests/test_autoscaling/test_autoscaling.py

View workflow job for this annotation

GitHub Actions / test / test (3.11) 

test_create_autoscaling_policy_with_policytype__targettrackingscaling

botocore.exceptions.ClientError: An error occurred (InvalidParameterValue) when calling the CreateSubnet operation: Value (us-west-1a) for parameter availabilityZone is invalid. Subnets can currently only be created in the following availability zones: af-south-1a, af-south-1b, af-south-1c, ap-south-1a, ap-south-1b, ap-south-1c, eu-west-3a, eu-west-3b, eu-west-3c, eu-north-1a, eu-north-1b, eu-north-1c, eu-west-2a, eu-west-2b, eu-west-2c, eu-west-1a, eu-west-1b, eu-west-1c, ap-northeast-3a, ap-northeast-3b, ap-northeast-3c, ap-northeast-2a, ap-northeast-2b, ap-northeast-2c, ap-northeast-2d, ap-northeast-1a, ap-northeast-1c, ap-northeast-1d, ap-east-1a, ap-east-1b, ap-east-1c, sa-east-1a, sa-east-1b, sa-east-1c, ca-central-1a, ca-central-1b, ca-central-1d, ap-southeast-1a, ap-southeast-1b, ap-southeast-1c, ap-southeast-2a, ap-southeast-2b, ap-southeast-2c, ap-southeast-3a, ap-southeast-3b, ap-southeast-3c, eu-central-1a, eu-central-1b, eu-central-1c, eu-central-2a, eu-central-2b, eu-central-2c, eu-south-1a, eu-south-1b, eu-south-1c, us-east-1a, us-east-1b, us-east-1c, us-east-1d, us-east-1e, us-east-1f, us-east-2a, us-east-2b, us-east-2c, us-west-1b, us-west-1c, us-west-2a, us-west-2b, us-west-2c, us-west-2d, me-south-1a, me-south-1b, me-south-1c, cn-north-1a, cn-north-1b, cn-northwest-1a, cn-northwest-1b, cn-northwest-1c, us-gov-west-1a, us-gov-west-1b, us-gov-west-1c, us-gov-east-1a, us-gov-east-1b, us-gov-east-1c.

Check failure on line 731 in tests/test_autoscaling/test_autoscaling.py

View workflow job for this annotation

GitHub Actions / test / test (3.8) 

test_create_autoscaling_policy_with_policytype__targettrackingscaling

botocore.exceptions.ClientError: An error occurred (InvalidParameterValue) when calling the CreateSubnet operation: Value (us-west-1a) for parameter availabilityZone is invalid. Subnets can currently only be created in the following availability zones: af-south-1a, af-south-1b, af-south-1c, ap-south-1a, ap-south-1b, ap-south-1c, eu-west-3a, eu-west-3b, eu-west-3c, eu-north-1a, eu-north-1b, eu-north-1c, eu-west-2a, eu-west-2b, eu-west-2c, eu-west-1a, eu-west-1b, eu-west-1c, ap-northeast-3a, ap-northeast-3b, ap-northeast-3c, ap-northeast-2a, ap-northeast-2b, ap-northeast-2c, ap-northeast-2d, ap-northeast-1a, ap-northeast-1c, ap-northeast-1d, ap-east-1a, ap-east-1b, ap-east-1c, sa-east-1a, sa-east-1b, sa-east-1c, ca-central-1a, ca-central-1b, ca-central-1d, ap-southeast-1a, ap-southeast-1b, ap-southeast-1c, ap-southeast-2a, ap-southeast-2b, ap-southeast-2c, ap-southeast-3a, ap-southeast-3b, ap-southeast-3c, eu-central-1a, eu-central-1b, eu-central-1c, eu-central-2a, eu-central-2b, eu-central-2c, eu-south-1a, eu-south-1b, eu-south-1c, us-east-1a, us-east-1b, us-east-1c, us-east-1d, us-east-1e, us-east-1f, us-east-2a, us-east-2b, us-east-2c, us-west-1b, us-west-1c, us-west-2a, us-west-2b, us-west-2c, us-west-2d, me-south-1a, me-south-1b, me-south-1c, cn-north-1a, cn-north-1b, cn-northwest-1a, cn-northwest-1b, cn-northwest-1c, us-gov-west-1a, us-gov-west-1b, us-gov-west-1c, us-gov-east-1a, us-gov-east-1b, us-gov-east-1c.

Check failure on line 731 in tests/test_autoscaling/test_autoscaling.py

View workflow job for this annotation

GitHub Actions / test / test (3.10) 

test_create_autoscaling_policy_with_policytype__targettrackingscaling

botocore.exceptions.ClientError: An error occurred (InvalidParameterValue) when calling the CreateSubnet operation: Value (us-west-1a) for parameter availabilityZone is invalid. Subnets can currently only be created in the following availability zones: af-south-1a, af-south-1b, af-south-1c, ap-south-1a, ap-south-1b, ap-south-1c, eu-west-3a, eu-west-3b, eu-west-3c, eu-north-1a, eu-north-1b, eu-north-1c, eu-west-2a, eu-west-2b, eu-west-2c, eu-west-1a, eu-west-1b, eu-west-1c, ap-northeast-3a, ap-northeast-3b, ap-northeast-3c, ap-northeast-2a, ap-northeast-2b, ap-northeast-2c, ap-northeast-2d, ap-northeast-1a, ap-northeast-1c, ap-northeast-1d, ap-east-1a, ap-east-1b, ap-east-1c, sa-east-1a, sa-east-1b, sa-east-1c, ca-central-1a, ca-central-1b, ca-central-1d, ap-southeast-1a, ap-southeast-1b, ap-southeast-1c, ap-southeast-2a, ap-southeast-2b, ap-southeast-2c, ap-southeast-3a, ap-southeast-3b, ap-southeast-3c, eu-central-1a, eu-central-1b, eu-central-1c, eu-central-2a, eu-central-2b, eu-central-2c, eu-south-1a, eu-south-1b, eu-south-1c, us-east-1a, us-east-1b, us-east-1c, us-east-1d, us-east-1e, us-east-1f, us-east-2a, us-east-2b, us-east-2c, us-west-1b, us-west-1c, us-west-2a, us-west-2b, us-west-2c, us-west-2d, me-south-1a, me-south-1b, me-south-1c, cn-north-1a, cn-north-1b, cn-northwest-1a, cn-northwest-1b, cn-northwest-1c, us-gov-west-1a, us-gov-west-1b, us-gov-west-1c, us-gov-east-1a, us-gov-east-1b, us-gov-east-1c.

Check failure on line 731 in tests/test_autoscaling/test_autoscaling.py

View workflow job for this annotation

GitHub Actions / test / test (3.9) 

test_create_autoscaling_policy_with_policytype__targettrackingscaling

botocore.exceptions.ClientError: An error occurred (InvalidParameterValue) when calling the CreateSubnet operation: Value (us-west-1a) for parameter availabilityZone is invalid. Subnets can currently only be created in the following availability zones: af-south-1a, af-south-1b, af-south-1c, ap-south-1a, ap-south-1b, ap-south-1c, eu-west-3a, eu-west-3b, eu-west-3c, eu-north-1a, eu-north-1b, eu-north-1c, eu-west-2a, eu-west-2b, eu-west-2c, eu-west-1a, eu-west-1b, eu-west-1c, ap-northeast-3a, ap-northeast-3b, ap-northeast-3c, ap-northeast-2a, ap-northeast-2b, ap-northeast-2c, ap-northeast-2d, ap-northeast-1a, ap-northeast-1c, ap-northeast-1d, ap-east-1a, ap-east-1b, ap-east-1c, sa-east-1a, sa-east-1b, sa-east-1c, ca-central-1a, ca-central-1b, ca-central-1d, ap-southeast-1a, ap-southeast-1b, ap-southeast-1c, ap-southeast-2a, ap-southeast-2b, ap-southeast-2c, ap-southeast-3a, ap-southeast-3b, ap-southeast-3c, eu-central-1a, eu-central-1b, eu-central-1c, eu-central-2a, eu-central-2b, eu-central-2c, eu-south-1a, eu-south-1b, eu-south-1c, us-east-1a, us-east-1b, us-east-1c, us-east-1d, us-east-1e, us-east-1f, us-east-2a, us-east-2b, us-east-2c, us-west-1b, us-west-1c, us-west-2a, us-west-2b, us-west-2c, us-west-2d, me-south-1a, me-south-1b, me-south-1c, cn-north-1a, cn-north-1b, cn-northwest-1a, cn-northwest-1b, cn-northwest-1c, us-gov-west-1a, us-gov-west-1b, us-gov-west-1c, us-gov-east-1a, us-gov-east-1b, us-gov-east-1c.

Check failure on line 731 in tests/test_autoscaling/test_autoscaling.py

View workflow job for this annotation

GitHub Actions / test / test (3.12) 

test_create_autoscaling_policy_with_policytype__targettrackingscaling

botocore.exceptions.ClientError: An error occurred (InvalidParameterValue) when calling the CreateSubnet operation: Value (us-west-1a) for parameter availabilityZone is invalid. Subnets can currently only be created in the following availability zones: af-south-1a, af-south-1b, af-south-1c, ap-south-1a, ap-south-1b, ap-south-1c, eu-west-3a, eu-west-3b, eu-west-3c, eu-north-1a, eu-north-1b, eu-north-1c, eu-west-2a, eu-west-2b, eu-west-2c, eu-west-1a, eu-west-1b, eu-west-1c, ap-northeast-3a, ap-northeast-3b, ap-northeast-3c, ap-northeast-2a, ap-northeast-2b, ap-northeast-2c, ap-northeast-2d, ap-northeast-1a, ap-northeast-1c, ap-northeast-1d, ap-east-1a, ap-east-1b, ap-east-1c, sa-east-1a, sa-east-1b, sa-east-1c, ca-central-1a, ca-central-1b, ca-central-1d, ap-southeast-1a, ap-southeast-1b, ap-southeast-1c, ap-southeast-2a, ap-southeast-2b, ap-southeast-2c, ap-southeast-3a, ap-southeast-3b, ap-southeast-3c, eu-central-1a, eu-central-1b, eu-central-1c, eu-central-2a, eu-central-2b, eu-central-2c, eu-south-1a, eu-south-1b, eu-south-1c, us-east-1a, us-east-1b, us-east-1c, us-east-1d, us-east-1e, us-east-1f, us-east-2a, us-east-2b, us-east-2c, us-west-1b, us-west-1c, us-west-2a, us-west-2b, us-west-2c, us-west-2d, me-south-1a, me-south-1b, me-south-1c, cn-north-1a, cn-north-1b, cn-northwest-1a, cn-northwest-1b, cn-northwest-1c, us-gov-west-1a, us-gov-west-1b, us-gov-west-1c, us-gov-east-1a, us-gov-east-1b, us-gov-east-1c.
client = boto3.client("autoscaling", region_name="us-west-1")
configuration_name = "test"
asg_name = "asg_test"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_autoscaling/test_autoscaling_cloudformation.py
View file
Open in desktop
Expand Up @@ -423,7 +423,7 @@ def test_autoscaling_group_update():
"my-as-group": {
"Type": "AWS::AutoScaling::AutoScalingGroup",
"Properties": {
"AvailabilityZones": ["us-west-1a"],
"AvailabilityZones": ["us-west-1b"],
"LaunchConfigurationName": {"Ref": "my-launch-config"},
"MinSize": "2",
"MaxSize": "2",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_core/test_ec2_vpc_endpoint_services.py
View file
Open in desktop
Expand Up @@ -114,7 +114,7 @@ def test_describe_vpc_default_endpoint_services() -> None:
)
details = config_service["ServiceDetails"][0]
assert details["AcceptanceRequired"] is False
assert details["AvailabilityZones"] == ["us-west-1a", "us-west-1b"]
assert details["AvailabilityZones"] == ["us-west-1b", "us-west-1c"]
assert details["BaseEndpointDnsNames"] == ["config.us-west-1.vpce.amazonaws.com"]
assert details["ManagesVpcEndpoints"] is False
assert details["Owner"] == "amazon"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ec2/test_ec2_cloudformation.py
View file
Open in desktop
Expand Up @@ -717,7 +717,7 @@ def test_vpc_endpoint_creation():
ec2_client = boto3.client("ec2", region_name="us-west-1")
vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet1 = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)

subnet_template = {
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ec2/test_fleets.py
View file
Open in desktop
Expand Up @@ -548,7 +548,7 @@ def test_create_fleet_api_response():
},
"Overrides": [
{
"AvailabilityZone": "us-west-1a",
"AvailabilityZone": "us-west-1b",
"InstanceRequirements": {
"AcceleratorCount": {
"Max": 10,
Expand Down
14 changes: 7 additions & 7 deletions tests/test_ec2/test_hosts.py
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
def test_allocate_hosts():
client = boto3.client("ec2", "us-west-1")
resp = client.allocate_hosts(
AvailabilityZone="us-west-1a",
AvailabilityZone="us-west-1b",
InstanceType="a1.small",
HostRecovery="off",
AutoPlacement="on",
Expand All @@ -22,7 +22,7 @@ def test_allocate_hosts():
def test_describe_hosts_with_instancefamily():
client = boto3.client("ec2", "us-west-1")
host_ids = client.allocate_hosts(
AvailabilityZone="us-west-1a", InstanceFamily="c5", Quantity=1
AvailabilityZone="us-west-1b", InstanceFamily="c5", Quantity=1
)["HostIds"]

host = client.describe_hosts(HostIds=host_ids)["Hosts"][0]
Expand Down Expand Up @@ -69,7 +69,7 @@ def test_describe_hosts_with_tags():
assert host["Tags"] == [{"Key": tagkey, "Value": "v1"}]

client.allocate_hosts(
AvailabilityZone="us-west-1a", InstanceType="b1.large", Quantity=1
AvailabilityZone="us-west-1b", InstanceType="b1.large", Quantity=1
)
hosts = client.describe_hosts(Filters=[{"Name": "tag-key", "Values": [tagkey]}])[
"Hosts"
Expand All @@ -81,7 +81,7 @@ def test_describe_hosts_with_tags():
def test_describe_hosts_using_filters():
client = boto3.client("ec2", "us-west-1")
host_id1 = client.allocate_hosts(
AvailabilityZone="us-west-1a", InstanceType="b1.large", Quantity=1
AvailabilityZone="us-west-1c", InstanceType="b1.large", Quantity=1
)["HostIds"][0]
host_id2 = client.allocate_hosts(
AvailabilityZone="us-west-1b", InstanceType="b1.large", Quantity=1
Expand Down Expand Up @@ -113,7 +113,7 @@ def test_describe_hosts_using_filters():
def test_modify_hosts():
client = boto3.client("ec2", "us-west-1")
host_ids = client.allocate_hosts(
AvailabilityZone="us-west-1a", InstanceFamily="c5", Quantity=1
AvailabilityZone="us-west-1b", InstanceFamily="c5", Quantity=1
)["HostIds"]

client.modify_hosts(
Expand All @@ -135,7 +135,7 @@ def test_modify_hosts():
def test_release_hosts():
client = boto3.client("ec2", "us-west-1")
host_ids = client.allocate_hosts(
AvailabilityZone="us-west-1a",
AvailabilityZone="us-west-1b",
InstanceType="a1.small",
HostRecovery="off",
AutoPlacement="on",
Expand All @@ -154,7 +154,7 @@ def test_release_hosts():
def test_add_tags_to_dedicated_hosts():
client = boto3.client("ec2", "us-west-1")
resp = client.allocate_hosts(
AvailabilityZone="us-west-1a", InstanceType="a1.small", Quantity=1
AvailabilityZone="us-west-1b", InstanceType="a1.small", Quantity=1
)
host_id = resp["HostIds"][0]

Expand Down
4 changes: 2 additions & 2 deletions tests/test_ec2/test_launch_templates_cloudformation.py
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ def test_asg_with_latest_launch_template_version():
autoscaling_client = boto3.client("autoscaling", region_name="us-west-1")

subnet1 = ec2.create_subnet(
CidrBlock="10.0.1.0/24", VpcId=vpc.id, AvailabilityZone="us-west-1a"
CidrBlock="10.0.1.0/24", VpcId=vpc.id, AvailabilityZone="us-west-1c"
)

subnet2 = ec2.create_subnet(
Expand Down Expand Up @@ -133,7 +133,7 @@ def test_asg_with_default_launch_template_version():
autoscaling_client = boto3.client("autoscaling", region_name="us-west-1")

subnet1 = ec2.create_subnet(
CidrBlock="10.0.1.0/24", VpcId=vpc.id, AvailabilityZone="us-west-1a"
CidrBlock="10.0.1.0/24", VpcId=vpc.id, AvailabilityZone="us-west-1c"
)

subnet2 = ec2.create_subnet(
Expand Down
36 changes: 18 additions & 18 deletions tests/test_ec2/test_subnets.py
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ def test_default_subnet():
assert default_vpc.is_default is True

subnet = ec2.create_subnet(
VpcId=default_vpc.id, CidrBlock="172.31.48.0/20", AvailabilityZone="us-west-1a"
VpcId=default_vpc.id, CidrBlock="172.31.48.0/20", AvailabilityZone="us-west-1b"
)
subnet.reload()
assert subnet.map_public_ip_on_launch is False
Expand All @@ -115,7 +115,7 @@ def test_non_default_subnet():
assert vpc.is_default is False

subnet = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)
subnet.reload()
assert subnet.map_public_ip_on_launch is False
Expand All @@ -132,7 +132,7 @@ def test_modify_subnet_attribute_public_ip_on_launch():
random_subnet_cidr = f"{random_ip}/20" # Same block as the VPC

subnet = ec2.create_subnet(
VpcId=vpc.id, CidrBlock=random_subnet_cidr, AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock=random_subnet_cidr, AvailabilityZone="us-west-1b"
)

# 'map_public_ip_on_launch' is set when calling 'DescribeSubnets' action
Expand Down Expand Up @@ -165,7 +165,7 @@ def test_modify_subnet_attribute_assign_ipv6_address_on_creation():
random_subnet_cidr = f"{random_ip}/20" # Same block as the VPC

subnet = ec2.create_subnet(
VpcId=vpc.id, CidrBlock=random_subnet_cidr, AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock=random_subnet_cidr, AvailabilityZone="us-west-1b"
)

# 'map_public_ip_on_launch' is set when calling 'DescribeSubnets' action
Expand Down Expand Up @@ -194,7 +194,7 @@ def test_modify_subnet_attribute_validation():
ec2 = boto3.resource("ec2", region_name="us-west-1")
vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)


Expand All @@ -204,14 +204,14 @@ def test_subnet_get_by_id():
client = boto3.client("ec2", region_name="us-west-1")
vpcA = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnetA = ec2.create_subnet(
VpcId=vpcA.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpcA.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)
vpcB = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnetB1 = ec2.create_subnet(
VpcId=vpcB.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpcB.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)
ec2.create_subnet(
VpcId=vpcB.id, CidrBlock="10.0.1.0/24", AvailabilityZone="us-west-1b"
VpcId=vpcB.id, CidrBlock="10.0.1.0/24", AvailabilityZone="us-west-1c"
)

subnets_by_id = client.describe_subnets(SubnetIds=[subnetA.id, subnetB1.id])[
Expand All @@ -235,14 +235,14 @@ def test_get_subnets_filtering():
client = boto3.client("ec2", region_name="us-west-1")
vpcA = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnetA = ec2.create_subnet(
VpcId=vpcA.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpcA.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)
vpcB = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnetB1 = ec2.create_subnet(
VpcId=vpcB.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpcB.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)
subnetB2 = ec2.create_subnet(
VpcId=vpcB.id, CidrBlock="10.0.1.0/24", AvailabilityZone="us-west-1b"
VpcId=vpcB.id, CidrBlock="10.0.1.0/24", AvailabilityZone="us-west-1c"
)

nr_of_a_zones = len(client.describe_availability_zones()["AvailabilityZones"])
Expand Down Expand Up @@ -311,7 +311,7 @@ def test_get_subnets_filtering():
# Filter by availabilityZone
subnets_by_az = client.describe_subnets(
Filters=[
{"Name": "availabilityZone", "Values": ["us-west-1a"]},
{"Name": "availabilityZone", "Values": ["us-west-1b"]},
{"Name": "vpc-id", "Values": [vpcB.id]},
]
)["Subnets"]
Expand All @@ -338,7 +338,7 @@ def test_create_subnet_response_fields():

vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet = client.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)["Subnet"]

assert "AvailabilityZone" in subnet
Expand Down Expand Up @@ -367,7 +367,7 @@ def test_describe_subnet_response_fields():

vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet_object = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)

subnets = client.describe_subnets(SubnetIds=[subnet_object.id])["Subnets"]
Expand Down Expand Up @@ -710,7 +710,7 @@ def test_describe_subnets_by_vpc_id():

vpc1 = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet1 = ec2.create_subnet(
VpcId=vpc1.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc1.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1c"
)
vpc2 = ec2.create_vpc(CidrBlock="172.31.0.0/16")
subnet2 = ec2.create_subnet(
Expand Down Expand Up @@ -749,7 +749,7 @@ def test_describe_subnets_by_state():

vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)

subnets = client.describe_subnets(
Expand All @@ -766,7 +766,7 @@ def test_associate_subnet_cidr_block():

vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet_object = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)

subnets = client.describe_subnets(SubnetIds=[subnet_object.id])["Subnets"]
Expand Down Expand Up @@ -796,7 +796,7 @@ def test_disassociate_subnet_cidr_block():

vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
subnet_object = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1a"
VpcId=vpc.id, CidrBlock="10.0.0.0/24", AvailabilityZone="us-west-1b"
)

client.associate_subnet_cidr_block(
Expand Down
12 changes: 6 additions & 6 deletions tests/test_ec2/test_vpc_endpoint_services_integration.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ def fake_endpoint_services():
return [
{
"AcceptanceRequired": False,
"AvailabilityZones": ["us-west-1a", "us-west-1b"],
"AvailabilityZones": ["us-west-1b", "us-west-1c"],
"BaseEndpointDnsNames": ["access-analyzer.us-west-1.vpce.amazonaws.com"],
"ManagesVpcEndpoints": False,
"Owner": "amazon",
Expand All @@ -27,7 +27,7 @@ def fake_endpoint_services():
},
{
"AcceptanceRequired": False,
"AvailabilityZones": ["us-west-1a", "us-west-1b"],
"AvailabilityZones": ["us-west-1b", "us-west-1c"],
"BaseEndpointDnsNames": ["config.us-west-1.vpce.amazonaws.com"],
"ManagesVpcEndpoints": False,
"Owner": "amazon",
Expand All @@ -42,7 +42,7 @@ def fake_endpoint_services():
},
{
"AcceptanceRequired": True,
"AvailabilityZones": ["us-west-1a", "us-west-1b"],
"AvailabilityZones": ["us-west-1b", "us-west-1c"],
"BaseEndpointDnsNames": ["s3.us-west-1.amazonaws.com"],
"ManagesVpcEndpoints": True,
"Owner": "amazon",
Expand All @@ -54,7 +54,7 @@ def fake_endpoint_services():
},
{
"AcceptanceRequired": False,
"AvailabilityZones": ["us-west-1a", "us-west-1b"],
"AvailabilityZones": ["us-west-1b", "us-west-1c"],
"BaseEndpointDnsNames": ["s3.us-west-1.vpce.amazonaws.com"],
"ManagesVpcEndpoints": False,
"Owner": "amazon",
Expand All @@ -73,7 +73,7 @@ def fake_endpoint_services():
def validate_s3_service_endpoint_gateway(details):
"""Validate response contains appropriate s3 Gateway service details."""
assert details["AcceptanceRequired"] is True
assert details["AvailabilityZones"] == ["us-west-1a", "us-west-1b"]
assert details["AvailabilityZones"] == ["us-west-1b", "us-west-1c"]
assert details["BaseEndpointDnsNames"] == ["s3.us-west-1.amazonaws.com"]
assert details["ManagesVpcEndpoints"] is True
assert details["Owner"] == "amazon"
Expand All @@ -87,7 +87,7 @@ def validate_s3_service_endpoint_gateway(details):
def validate_s3_service_endpoint_interface(details):
"""Validate response contains appropriate s3 Gateway service details."""
assert details["AcceptanceRequired"] is False
assert details["AvailabilityZones"] == ["us-west-1a", "us-west-1b"]
assert details["AvailabilityZones"] == ["us-west-1b", "us-west-1c"]
assert details["BaseEndpointDnsNames"] == ["s3.us-west-1.vpce.amazonaws.com"]
assert details["ManagesVpcEndpoints"] is False
assert details["Owner"] == "amazon"
Expand Down