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

correctly getting the vpc address back

Browse source
This commit is contained in:
Jon Haddad 2013-10-30 18:50:42 -07:00
commit 9ae144bad8
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
moto/ec2/responses/security_groups.py
View file

@ -31,7 +31,8 @@ class SecurityGroups(object):
def create_security_group(self):
name = self.querystring.get('GroupName')[0]
description = self.querystring.get('GroupDescription')[0]
group = ec2_backend.create_security_group(name, description)
vpc_id = self.querystring.get("VpcId", [None])[0]
group = ec2_backend.create_security_group(name, description, vpc_id=vpc_id)
if not group:
# There was an exisitng group
return "There was an existing security group with name {0}".format(name), dict(status=409)
@ -83,7 +84,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName>
<groupDescription>{{ group.description }}</groupDescription>
<vpcId/>
<vpcId>{{ group.vpc_id if group.vpc_id != None}}</vpcId>
<ipPermissions>
{% for rule in group.ingress_rules %}
<item>