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

Fix json templates to include DBInstance element.

Browse Source
This commit is contained in:
Chris Henry 2015-01-27 01:53:42 -05:00
parent df036fe207
commit f78d3b79df
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
moto/rds2/responses.py
View File

@ -80,8 +80,7 @@ class RDS2Response(BaseResponse):
db_kwargs = self._get_db_kwargs() db_kwargs = self._get_db_kwargs()
database = self.backend.create_database(db_kwargs) database = self.backend.create_database(db_kwargs)
template = self.response_template(CREATE_DATABASE_TEMPLATE) template = self.response_template(CREATE_DATABASE_TEMPLATE)
result = template.render(database=database) return template.render(database=database)
return result
def create_dbinstance_read_replica(self): def create_dbinstance_read_replica(self):
return self.create_db_instance_read_replica() return self.create_db_instance_read_replica()
@ -245,7 +244,7 @@ class RDS2Response(BaseResponse):
CREATE_DATABASE_TEMPLATE = """{ CREATE_DATABASE_TEMPLATE = """{
"CreateDBInstanceResponse": { "CreateDBInstanceResponse": {
"CreateDBInstanceResult": { "CreateDBInstanceResult": {
{{ database.to_json() }} "DBInstance": {{ database.to_json() }}
}, },
"ResponseMetadata": { "RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4" } "ResponseMetadata": { "RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4" }
} }
@ -261,20 +260,22 @@ CREATE_DATABASE_REPLICA_TEMPLATE = """{
}""" }"""
DESCRIBE_DATABASES_TEMPLATE = """{ DESCRIBE_DATABASES_TEMPLATE = """{
"DescribeDBInstanceResponse": { "DescribeDBInstancesResponse": {
"DescribeDBInstanceResult": [ "DescribeDBInstancesResult": {
{%- for database in databases -%} "DBInstances": [
{%- if loop.index != 1 -%},{%- endif -%} {%- for database in databases -%}
{ {{ database.to_json() }} } {%- if loop.index != 1 -%},{%- endif -%}
{%- endfor -%} {{ database.to_json() }}
], {%- endfor -%}
]
},
"ResponseMetadata": { "RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4" } "ResponseMetadata": { "RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4" }
} }
}""" }"""
MODIFY_DATABASE_TEMPLATE = """{"ModifyDBInstanceResponse": { MODIFY_DATABASE_TEMPLATE = """{"ModifyDBInstanceResponse": {
"ModifyDBInstanceResult": { "ModifyDBInstanceResult": {
{{ database.to_json() }}, "DBInstance": {{ database.to_json() }},
"ResponseMetadata": { "ResponseMetadata": {
"RequestId": "bb58476c-a1a8-11e4-99cf-55e92d4bbada" "RequestId": "bb58476c-a1a8-11e4-99cf-55e92d4bbada"
} }
@ -284,22 +285,24 @@ MODIFY_DATABASE_TEMPLATE = """{"ModifyDBInstanceResponse": {
REBOOT_DATABASE_TEMPLATE = """{"RebootDBInstanceResponse": { REBOOT_DATABASE_TEMPLATE = """{"RebootDBInstanceResponse": {
"RebootDBInstanceResult": { "RebootDBInstanceResult": {
{{ database.to_json() }}, "DBInstance": {{ database.to_json() }},
"ResponseMetadata": { "ResponseMetadata": {
"RequestId": "d55711cb-a1ab-11e4-99cf-55e92d4bbada" "RequestId": "d55711cb-a1ab-11e4-99cf-55e92d4bbada"
}
} }
} }
}}""" }"""
# TODO: update delete DB TEMPLATE # TODO: update delete DB TEMPLATE
DELETE_DATABASE_TEMPLATE = """{ "DeleteDBInstanceResponse": { DELETE_DATABASE_TEMPLATE = """{ "DeleteDBInstanceResponse": {
"DeleteDBInstanceResult": { "DeleteDBInstanceResult": {
{{ database.to_json() }}, "DBInstance": {{ database.to_json() }}
},
"ResponseMetadata": { "ResponseMetadata": {
"RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4" "RequestId": "523e3218-afc7-11c3-90f5-f90431260ab4"
} }
} }
}}""" }"""
CREATE_SECURITY_GROUP_TEMPLATE = """<CreateDBSecurityGroupResponse xmlns="http://rds.amazonaws.com/doc/2014-09-01/"> CREATE_SECURITY_GROUP_TEMPLATE = """<CreateDBSecurityGroupResponse xmlns="http://rds.amazonaws.com/doc/2014-09-01/">
<CreateDBSecurityGroupResult> <CreateDBSecurityGroupResult>