From 9ae144bad8e1182e7ef88774ebd6b72658c0a74a Mon Sep 17 00:00:00 2001
From: Jon Haddad <jon@jonhaddad.com>
Date: Wed, 30 Oct 2013 18:50:42 -0700
Subject: [PATCH] correctly getting the vpc address back

---
 moto/ec2/models.py                    | 9 ++++++---
 moto/ec2/responses/security_groups.py | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index 0a391c5d7..95903b82f 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -300,27 +300,30 @@ class SecurityRule(object):
 
 
 class SecurityGroup(object):
-    def __init__(self, group_id, name, description):
+    def __init__(self, group_id, name, description, vpc_id=None):
         self.id = group_id
         self.name = name
         self.description = description
         self.ingress_rules = []
         self.egress_rules = []
+        self.vpc_id = vpc_id
 
 
 class SecurityGroupBackend(object):
 
     def __init__(self):
         self.groups = {}
+        self.vpc_groups = {}
+
         super(SecurityGroupBackend, self).__init__()
 
-    def create_security_group(self, name, description, force=False):
+    def create_security_group(self, name, description, vpc_id=None, force=False):
         group_id = random_security_group_id()
         if not force:
             existing_group = self.get_security_group_from_name(name)
             if existing_group:
                 return None
-        group = SecurityGroup(group_id, name, description)
+        group = SecurityGroup(group_id, name, description, vpc_id=vpc_id)
         self.groups[group_id] = group
         return group
 
diff --git a/moto/ec2/responses/security_groups.py b/moto/ec2/responses/security_groups.py
index 69d32d5fb..16905104f 100644
--- a/moto/ec2/responses/security_groups.py
+++ b/moto/ec2/responses/security_groups.py
@@ -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>