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

Include db_name when describing RDS instances

Browse Source
This commit is contained in:
Jack Danger Canty 2017-06-13 17:09:09 -07:00
parent e079fab9e3
commit 559a863d7f
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moto/rds2/models.py
View File

@ -131,6 +131,7 @@ class Database(BaseModel):
template = Template("""<DBInstance> template = Template("""<DBInstance>
<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 %}
<MultiAZ>{{ database.multi_az }}</MultiAZ> <MultiAZ>{{ database.multi_az }}</MultiAZ>
<VpcSecurityGroups/> <VpcSecurityGroups/>
<DBInstanceIdentifier>{{ database.db_instance_identifier }}</DBInstanceIdentifier> <DBInstanceIdentifier>{{ database.db_instance_identifier }}</DBInstanceIdentifier>

2
tests/test_rds2/test_rds2.py
View File

@ -14,12 +14,14 @@ def test_create_database():
database = conn.create_db_instance(DBInstanceIdentifier='db-master-1', database = conn.create_db_instance(DBInstanceIdentifier='db-master-1',
AllocatedStorage=10, AllocatedStorage=10,
Engine='postgres', Engine='postgres',
DBName='staging-postgres',
DBInstanceClass='db.m1.small', DBInstanceClass='db.m1.small',
MasterUsername='root', MasterUsername='root',
MasterUserPassword='hunter2', MasterUserPassword='hunter2',
Port=1234, Port=1234,
DBSecurityGroups=["my_sg"]) DBSecurityGroups=["my_sg"])
database['DBInstance']['DBInstanceStatus'].should.equal('available') database['DBInstance']['DBInstanceStatus'].should.equal('available')
database['DBInstance']['DBName'].should.equal('staging-postgres')
database['DBInstance']['DBInstanceIdentifier'].should.equal("db-master-1") database['DBInstance']['DBInstanceIdentifier'].should.equal("db-master-1")
database['DBInstance']['AllocatedStorage'].should.equal(10) database['DBInstance']['AllocatedStorage'].should.equal(10)
database['DBInstance']['DBInstanceClass'].should.equal("db.m1.small") database['DBInstance']['DBInstanceClass'].should.equal("db.m1.small")