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

RDS: Add AvailabilityZone to describe_db_instances (#5373)

Browse Source
This commit is contained in:
Lukasz Demolin 2022-08-10 22:49:07 +02:00 committed by GitHub
parent 9dab6cd341
commit c4965d1e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/rds/models.py
View File

@ -387,6 +387,8 @@ class Database(CloudFormationModel):
if self.backup_retention_period is None: if self.backup_retention_period is None:
self.backup_retention_period = 1 self.backup_retention_period = 1
self.availability_zone = kwargs.get("availability_zone") self.availability_zone = kwargs.get("availability_zone")
if not self.availability_zone:
self.availability_zone = f"{self.region_name}a"
self.multi_az = kwargs.get("multi_az") self.multi_az = kwargs.get("multi_az")
self.db_subnet_group_name = kwargs.get("db_subnet_group_name") self.db_subnet_group_name = kwargs.get("db_subnet_group_name")
if self.db_subnet_group_name: if self.db_subnet_group_name:
@ -495,6 +497,7 @@ class Database(CloudFormationModel):
def to_xml(self): def to_xml(self):
template = Template( template = Template(
"""<DBInstance> """<DBInstance>
<AvailabilityZone>{{ database.availability_zone }}</AvailabilityZone>
<BackupRetentionPeriod>{{ database.backup_retention_period }}</BackupRetentionPeriod> <BackupRetentionPeriod>{{ database.backup_retention_period }}</BackupRetentionPeriod>
<DBInstanceStatus>{{ database.status }}</DBInstanceStatus> <DBInstanceStatus>{{ database.status }}</DBInstanceStatus>
{% if database.db_name %}<DBName>{{ database.db_name }}</DBName>{% endif %} {% if database.db_name %}<DBName>{{ database.db_name }}</DBName>{% endif %}

36
tests/test_rds/test_rds.py
View File

@ -2019,3 +2019,39 @@ def test_create_db_instance_with_tags():
resp = client.describe_db_instances(DBInstanceIdentifier=db_instance_identifier) resp = client.describe_db_instances(DBInstanceIdentifier=db_instance_identifier)
resp["DBInstances"][0]["TagList"].should.equal(tags) resp["DBInstances"][0]["TagList"].should.equal(tags)
@mock_rds
def test_create_db_instance_without_availability_zone():
region = "us-east-1"
client = boto3.client("rds", region_name=region)
db_instance_identifier = "test-db-instance"
resp = client.create_db_instance(
DBInstanceIdentifier=db_instance_identifier,
Engine="postgres",
DBName="staging-postgres",
DBInstanceClass="db.m1.small",
)
resp["DBInstance"]["AvailabilityZone"].should.contain(region)
resp = client.describe_db_instances(DBInstanceIdentifier=db_instance_identifier)
resp["DBInstances"][0]["AvailabilityZone"].should.contain(region)
@mock_rds
def test_create_db_instance_with_availability_zone():
region = "us-east-1"
availability_zone = f"{region}c"
client = boto3.client("rds", region_name=region)
db_instance_identifier = "test-db-instance"
resp = client.create_db_instance(
DBInstanceIdentifier=db_instance_identifier,
Engine="postgres",
DBName="staging-postgres",
DBInstanceClass="db.m1.small",
AvailabilityZone=availability_zone,
)
resp["DBInstance"]["AvailabilityZone"].should.equal(availability_zone)
resp = client.describe_db_instances(DBInstanceIdentifier=db_instance_identifier)
resp["DBInstances"][0]["AvailabilityZone"].should.equal(availability_zone)