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

rds2 model fixes.

Browse Source 
* Add the endpoint data to the to_json function.
* Remove the DBInstance key from the to_json template.
This commit is contained in:
Chris Henry 2015-01-27 01:28:38 -05:00
parent 2dde94c9be
commit df036fe207
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/rds2/models.py
View File

@ -158,7 +158,7 @@ class Database(object):
return database return database
def to_json(self): def to_json(self):
template = Template(""""DBInstance": { template = Template("""{
"AllocatedStorage": 10, "AllocatedStorage": 10,
"AutoMinorVersionUpgrade": "{{ database.auto_minor_version_upgrade }}", "AutoMinorVersionUpgrade": "{{ database.auto_minor_version_upgrade }}",
"AvailabilityZone": "{{ database.availability_zone }}", "AvailabilityZone": "{{ database.availability_zone }}",
@ -222,7 +222,10 @@ class Database(object):
"PreferredMaintenanceWindow": "{{ database.preferred_maintenance_window }}", "PreferredMaintenanceWindow": "{{ database.preferred_maintenance_window }}",
"PubliclyAccessible": "{{ database.publicly_accessible }}", "PubliclyAccessible": "{{ database.publicly_accessible }}",
"AllocatedStorage": "{{ database.allocated_storage }}", "AllocatedStorage": "{{ database.allocated_storage }}",
"Endpoint": null, "Endpoint": {
"Address": "{{ database.address }}",
"Port": "{{ database.port }}"
},
"InstanceCreateTime": null, "InstanceCreateTime": null,
"Iops": null, "Iops": null,
"ReadReplicaDBInstanceIdentifiers": [{%- for replica in database.replicas -%} "ReadReplicaDBInstanceIdentifiers": [{%- for replica in database.replicas -%}