catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added db_subnet_group support

Browse source
This commit is contained in:
Mike Fuller 2015-01-30 08:18:15 +11:00
commit 42ab9312bb
3 changed files with 94 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

45
moto/rds2/models.py
View file

@ -60,8 +60,8 @@ class Database(object):
if self.db_subnet_group_name:
self.db_subnet_group = rds2_backends[self.region].describe_subnet_groups(self.db_subnet_group_name)[0]
else:
self.db_subnet_group = []
self.db_security_groups = kwargs.get('security_groups', ['a'])
self.db_subnet_group = None
self.security_groups = kwargs.get('security_groups', [])
self.vpc_security_group_ids = kwargs.get('vpc_security_group_ids', [])
self.preferred_maintenance_window = kwargs.get('preferred_maintenance_window', 'wed:06:38-wed:07:08')
self.db_parameter_group_name = kwargs.get('db_parameter_group_name', None)
@ -174,37 +174,14 @@ class Database(object):
"DBParameterGroupName": "{{ database.db_parameter_group_name }}"
}
},{%- endif %}
"DBSecurityGroups": [{
{% for security_group in database.db_security_groups -%}{%- if loop.index != 1 -%},{%- endif -%}
"DBSecurityGroup": {
"DBSecurityGroups": [
{% for security_group in database.security_groups -%}{%- if loop.index != 1 -%},{%- endif -%}
{"DBSecurityGroup": {
"Status": "active",
"DBSecurityGroupName": "{{ security_group }}"
}{% endfor %}
}],{%- if database.db_subnet_group -%}
"DBSubnetGroup": {
"DBSubnetGroupDescription": "nabil-db-subnet-group",
"DBSubnetGroupName": "nabil-db-subnet-group",
"SubnetGroupStatus": "Complete",
"Subnets": [
{
"SubnetAvailabilityZone": {
"Name": "us-west-2c",
"ProvisionedIopsCapable": false
},
"SubnetIdentifier": "subnet-c0ea0099",
"SubnetStatus": "Active"
},
{
"SubnetAvailabilityZone": {
"Name": "us-west-2a",
"ProvisionedIopsCapable": false
},
"SubnetIdentifier": "subnet-ff885d88",
"SubnetStatus": "Active"
}
],
"VpcId": "vpc-8e6ab6eb"
},{%- endif %}
}}{% endfor %}
],
{%- if database.db_subnet_group -%}{{ database.db_subnet_group.to_json() }},{%- endif %}
"Engine": "{{ database.engine }}",
"EngineVersion": "{{ database.engine_version }}",
"LatestRestorableTime": null,
@ -386,8 +363,7 @@ class SubnetGroup(object):
return template.render(subnet_group=self)
def to_json(self):
template = Template("""{
"DBSubnetGroup": {
template = Template(""""DBSubnetGroup": {
"VpcId": "{{ subnet_group.vpc_id }}",
"SubnetGroupStatus": "{{ subnet_group.status }}",
"DBSubnetGroupDescription": "{{ subnet_group.description }}",
@ -404,8 +380,7 @@ class SubnetGroup(object):
}{%- if not loop.last -%},{%- endif -%}{% endfor %}
]
}
}
}""")
}""")
return template.render(subnet_group=self)
@classmethod

10
moto/rds2/responses.py
View file

@ -394,7 +394,7 @@ AUTHORIZE_SECURITY_GROUP_TEMPLATE = """{
CREATE_SUBNET_GROUP_TEMPLATE = """{
"CreateDBSubnetGroupResponse": {
"CreateDBSubnetGroupResult":
{{ subnet_group.to_json() }},
{ {{ subnet_group.to_json() }} },
"ResponseMetadata": { "RequestId": "3a401b3f-bb9e-11d3-f4c6-37db295f7674" }
}
}"""
@ -404,7 +404,7 @@ DESCRIBE_SUBNET_GROUPS_TEMPLATE = """{
"DescribeDBSubnetGroupsResult": {
"DBSubnetGroups": [
{% for subnet_group in subnet_groups %}
{{ subnet_group.to_json() }}{%- if not loop.last -%},{%- endif -%}
{ {{ subnet_group.to_json() }} }{%- if not loop.last -%},{%- endif -%}
{% endfor %}
],
"Marker": null
@ -414,11 +414,7 @@ DESCRIBE_SUBNET_GROUPS_TEMPLATE = """{
}"""
DELETE_SUBNET_GROUP_TEMPLATE = """<DeleteDBSubnetGroupResponse xmlns="http://rds.amazonaws.com/doc/2014-09-01/">
<ResponseMetadata>
<RequestId>6295e5ab-bbf3-11d3-f4c6-37db295f7674</RequestId>
</ResponseMetadata>
</DeleteDBSubnetGroupResponse>"""
DELETE_SUBNET_GROUP_TEMPLATE = """{"DeleteDBSubnetGroupResponse": {"ResponseMetadata": {"RequestId": "13785dd5-a7fc-11e4-bb9c-7f371d0859b0"}}}"""
CREATE_OPTION_GROUP_TEMPLATE = """{
"CreateOptionGroupResponse": {