Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EC2: Fix us-west-1 availability zones to b and c (#5513)

Browse Source
This commit is contained in:
Bert Blommers 2022-10-01 22:33:22 +00:00 committed by GitHub
parent 59910c812e
commit 37c5be725a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ec2/models/availability_zones_and_regions.py
View File

@ -238,8 +238,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"),

4
moto/ec2/models/instances.py
View File

@ -96,7 +96,7 @@ class Instance(TaggedEC2Resource, BotoInstance, CloudFormationModel):
self.user_data = user_data
self.security_groups = security_groups
self.instance_type = kwargs.get("instance_type", "m1.small")
self.region_name = kwargs.get("region_name", "us-east-1")
self.region_name = kwargs.get("region_name", ec2_backend.region_name)
placement = kwargs.get("placement", None)
self.subnet_id = kwargs.get("subnet_id")
if not self.subnet_id:
@ -157,7 +157,7 @@ class Instance(TaggedEC2Resource, BotoInstance, CloudFormationModel):
elif placement:
self._placement.zone = placement
else:
self._placement.zone = ec2_backend.region_name + "a"
self._placement.zone = ec2_backend.zones[self.region_name][0].name
self.block_device_mapping = BlockDeviceMapping()

12
tests/test_autoscaling/test_autoscaling.py
View File

@ -148,7 +148,7 @@ def test_create_auto_scaling_from_template_version__latest():
"LaunchTemplateName": launch_template_name,
"Version": "$Latest",
},
AvailabilityZones=["us-west-1a"],
AvailabilityZones=["us-west-1b"],
)
response = asg_client.describe_auto_scaling_groups(AutoScalingGroupNames=["name"])[
@ -185,7 +185,7 @@ def test_create_auto_scaling_from_template_version__default():
"LaunchTemplateName": launch_template_name,
"Version": "$Default",
},
AvailabilityZones=["us-west-1a"],
AvailabilityZones=["us-west-1b"],
)
response = asg_client.describe_auto_scaling_groups(AutoScalingGroupNames=["name"])[
@ -214,7 +214,7 @@ def test_create_auto_scaling_from_template_version__no_version():
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"])[
@ -715,8 +715,8 @@ def test_autoscaling_describe_policies():
@mock_autoscaling
@mock_ec2
def test_create_autoscaling_policy_with_policytype__targettrackingscaling():
mocked_networking = setup_networking(region_name="us-west-1")
client = boto3.client("autoscaling", region_name="us-west-1")
mocked_networking = setup_networking(region_name="us-east-1")
client = boto3.client("autoscaling", region_name="us-east-1")
configuration_name = "test"
asg_name = "asg_test"
@ -750,7 +750,7 @@ def test_create_autoscaling_policy_with_policytype__targettrackingscaling():
policy = resp["ScalingPolicies"][0]
policy.should.have.key("PolicyName").equals(configuration_name)
policy.should.have.key("PolicyARN").equals(
f"arn:aws:autoscaling:us-west-1:{ACCOUNT_ID}:scalingPolicy:c322761b-3172-4d56-9a21-0ed9d6161d67:autoScalingGroupName/{asg_name}:policyName/{configuration_name}"
f"arn:aws:autoscaling:us-east-1:{ACCOUNT_ID}:scalingPolicy:c322761b-3172-4d56-9a21-0ed9d6161d67:autoScalingGroupName/{asg_name}:policyName/{configuration_name}"
)
policy.should.have.key("PolicyType").equals("TargetTrackingScaling")
policy.should.have.key("TargetTrackingConfiguration").should.equal(

2
tests/test_autoscaling/test_autoscaling_cloudformation.py
View File

@ -416,7 +416,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",

2
tests/test_ec2/test_ec2_cloudformation.py
View File

@ -703,7 +703,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 = {

21
tests/test_ec2/test_regions.py
View File

@ -136,3 +136,24 @@ def test_describe_regions_dryrun():
ex.value.response["Error"]["Message"].should.equal(
"An error occurred (DryRunOperation) when calling the DescribeRegions operation: Request would have succeeded, but DryRun flag is set"
)
@mock_ec2
@pytest.mark.parametrize(
"region_name", ["us-east-1", "us-east-2", "us-west-1", "us-west-2"]
)
def test_describe_zones_and_get_instance_types(region_name):
"""
Verify that instance types exist in all exposed Availability Zones
https://github.com/spulec/moto/issues/5494
"""
client = boto3.client("ec2", region_name=region_name)
zones = client.describe_availability_zones()["AvailabilityZones"]
zone_names = [z["ZoneName"] for z in zones]
for zone in zone_names:
offerings = client.describe_instance_type_offerings(
LocationType="availability-zone",
Filters=[{"Name": "location", "Values": [zone]}],
)["InstanceTypeOfferings"]
assert len(offerings) > 0

38
tests/test_ec2/test_subnets.py
View File

@ -100,7 +100,7 @@ def test_default_subnet():
default_vpc.is_default.should.equal(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()
subnet.map_public_ip_on_launch.should.equal(False)
@ -116,7 +116,7 @@ def test_non_default_subnet():
vpc.is_default.should.equal(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()
subnet.map_public_ip_on_launch.should.equal(False)
@ -133,7 +133,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
@ -166,7 +166,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
@ -195,7 +195,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"
)
@ -205,14 +205,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])[
@ -236,14 +236,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"])
@ -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"]
@ -339,7 +339,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"]
subnet.should.have.key("AvailabilityZone")
@ -372,7 +372,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"]
@ -734,11 +734,11 @@ 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-1b"
)
vpc2 = ec2.create_vpc(CidrBlock="172.31.0.0/16")
subnet2 = ec2.create_subnet(
VpcId=vpc2.id, CidrBlock="172.31.48.0/20", AvailabilityZone="us-west-1b"
VpcId=vpc2.id, CidrBlock="172.31.48.0/20", AvailabilityZone="us-west-1c"
)
subnets = client.describe_subnets(
@ -773,7 +773,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(
@ -790,7 +790,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"]
@ -822,7 +822,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(

2
tests/test_ec2/test_vpc_endpoint_services_integration.py
View File

@ -251,7 +251,7 @@ def test_describe_vpc_default_endpoint_services():
)
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"

8
tests/test_elb/test_elb_cloudformation.py
View File

@ -18,7 +18,7 @@ def test_stack_elb_integration_with_attached_ec2_instances():
"Properties": {
"Instances": [{"Ref": "Ec2Instance1"}],
"LoadBalancerName": "test-elb",
"AvailabilityZones": ["us-west-1a"],
"AvailabilityZones": ["us-west-1b"],
"Listeners": [
{
"InstancePort": "80",
@ -47,7 +47,7 @@ def test_stack_elb_integration_with_attached_ec2_instances():
ec2_instance = reservations["Instances"][0]
load_balancer["Instances"][0]["InstanceId"].should.equal(ec2_instance["InstanceId"])
load_balancer["AvailabilityZones"].should.equal(["us-west-1a"])
load_balancer["AvailabilityZones"].should.equal(["us-west-1b"])
@mock_elb
@ -105,7 +105,7 @@ def test_stack_elb_integration_with_update():
"Type": "AWS::ElasticLoadBalancing::LoadBalancer",
"Properties": {
"LoadBalancerName": "test-elb",
"AvailabilityZones": ["us-west-1a"],
"AvailabilityZones": ["us-west-1c"],
"Listeners": [
{
"InstancePort": "80",
@ -127,7 +127,7 @@ def test_stack_elb_integration_with_update():
# then
elb = boto3.client("elb", region_name="us-west-1")
load_balancer = elb.describe_load_balancers()["LoadBalancerDescriptions"][0]
load_balancer["AvailabilityZones"].should.equal(["us-west-1a"])
load_balancer["AvailabilityZones"].should.equal(["us-west-1c"])
# when
elb_template["Resources"]["MyELB"]["Properties"]["AvailabilityZones"] = [

12
tests/test_elbv2/test_elbv2.py
View File

@ -76,10 +76,10 @@ def test_create_elb_using_subnetmapping():
)
vpc = ec2.create_vpc(CidrBlock="172.28.7.0/24", InstanceTenancy="default")
subnet1 = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="172.28.7.0/26", AvailabilityZone=region + "a"
VpcId=vpc.id, CidrBlock="172.28.7.0/26", AvailabilityZone=region + "b"
)
subnet2 = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="172.28.7.192/26", AvailabilityZone=region + "b"
VpcId=vpc.id, CidrBlock="172.28.7.192/26", AvailabilityZone=region + "c"
)
conn.create_load_balancer(
@ -93,10 +93,10 @@ def test_create_elb_using_subnetmapping():
lb = conn.describe_load_balancers()["LoadBalancers"][0]
lb.should.have.key("AvailabilityZones").length_of(2)
lb["AvailabilityZones"].should.contain(
{"ZoneName": "us-west-1a", "SubnetId": subnet1.id}
{"ZoneName": "us-west-1b", "SubnetId": subnet1.id}
)
lb["AvailabilityZones"].should.contain(
{"ZoneName": "us-west-1b", "SubnetId": subnet2.id}
{"ZoneName": "us-west-1c", "SubnetId": subnet2.id}
)
@ -240,10 +240,10 @@ def test_create_elb_in_multiple_region():
)
vpc = ec2.create_vpc(CidrBlock="172.28.7.0/24", InstanceTenancy="default")
subnet1 = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="172.28.7.0/26", AvailabilityZone=region + "a"
VpcId=vpc.id, CidrBlock="172.28.7.0/26", AvailabilityZone=region + "b"
)
subnet2 = ec2.create_subnet(
VpcId=vpc.id, CidrBlock="172.28.7.192/26", AvailabilityZone=region + "b"
VpcId=vpc.id, CidrBlock="172.28.7.192/26", AvailabilityZone=region + "c"
)
conn.create_load_balancer(