From 5a034973679e77da61ace263685fb13277498af9 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Fri, 8 Sep 2017 15:07:44 -0700
Subject: [PATCH 1/2] rendering vpc_id in ec2 responses

---
 moto/ec2/responses/instances.py  | 48 +++++++++++++++-----------------
 tests/test_ec2/test_instances.py |  4 +++
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py
index ea70b85b1..257efc1f2 100644
--- a/moto/ec2/responses/instances.py
+++ b/moto/ec2/responses/instances.py
@@ -255,18 +255,16 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
           <monitoring>
             <state>enabled</state>
           </monitoring>
-          {% if instance.nics %}
-            {% if instance.nics[0].subnet %}
-              <subnetId>{{ instance.nics[0].subnet.id }}</subnetId>
-              <vpcId>{{ instance.nics[0].subnet.vpc_id }}</vpcId>
-            {% endif %}
-            <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
-            {% if instance.public_ip %}
-                <ipAddress>{{ instance.public_ip }}</ipAddress>
-            {% endif %}
-          {% else %}
+          {% if instance.subnet_id %}
             <subnetId>{{ instance.subnet_id }}</subnetId>
           {% endif %}
+          {% if instance.vpc_id %}
+            <vpcId>{{ instance.vpc_id }}</vpcId>
+          {% endif %}
+          <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
+          {% if instance.nics[0].public_ip %}
+              <ipAddress>{{ instance.nics[0].public_ip }}</ipAddress>
+          {% endif %}
           <sourceDestCheck>{{ instance.source_dest_check }}</sourceDestCheck>
           <groupSet>
              {% for group in instance.dynamic_group_list %}
@@ -396,26 +394,26 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
                     <monitoring>
                       <state>disabled</state>
                     </monitoring>
-                    {% if instance.nics %}
-                      {% if instance.nics[0].subnet %}
-                        <subnetId>{{ instance.nics[0].subnet.id }}</subnetId>
-                        <vpcId>{{ instance.nics[0].subnet.vpc_id }}</vpcId>
-                      {% endif %}
-                      <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
-                      {% if instance.nics[0].public_ip %}
-                          <ipAddress>{{ instance.nics[0].public_ip }}</ipAddress>
-                      {% endif %}
+                    {% if instance.subnet_id %}
+                      <subnetId>{{ instance.subnet_id }}</subnetId>
+                    {% endif %}
+                    {% if instance.vpc_id %}
+                      <vpcId>{{ instance.vpc_id }}</vpcId>
+                    {% endif %}
+                    <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
+                    {% if instance.nics[0].public_ip %}
+                        <ipAddress>{{ instance.nics[0].public_ip }}</ipAddress>
                     {% endif %}
                     <sourceDestCheck>{{ instance.source_dest_check }}</sourceDestCheck>
                     <groupSet>
                       {% for group in instance.dynamic_group_list %}
                       <item>
-              {% if group.id %}
-              <groupId>{{ group.id }}</groupId>
-              <groupName>{{ group.name }}</groupName>
-              {% else %}
-              <groupId>{{ group }}</groupId>
-              {% endif %}
+                      {% if group.id %}
+                      <groupId>{{ group.id }}</groupId>
+                      <groupName>{{ group.name }}</groupName>
+                      {% else %}
+                      <groupId>{{ group }}</groupId>
+                      {% endif %}
                       </item>
                       {% endfor %}
                     </groupSet>
diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py
index a9af7c31f..04b8ba1e0 100644
--- a/tests/test_ec2/test_instances.py
+++ b/tests/test_ec2/test_instances.py
@@ -378,11 +378,15 @@ def test_get_instances_filtering_by_vpc_id():
     reservations1.should.have.length_of(1)
     reservations1[0].instances.should.have.length_of(1)
     reservations1[0].instances[0].id.should.equal(instance1.id)
+    reservations1[0].instances[0].vpc_id.should.equal(vpc1.id)
+    reservations1[0].instances[0].subnet_id.should.equal(subnet1.id)
 
     reservations2 = conn.get_all_instances(filters={'vpc-id': vpc2.id})
     reservations2.should.have.length_of(1)
     reservations2[0].instances.should.have.length_of(1)
     reservations2[0].instances[0].id.should.equal(instance2.id)
+    reservations2[0].instances[0].vpc_id.should.equal(vpc2.id)
+    reservations2[0].instances[0].subnet_id.should.equal(subnet2.id)
 
 
 @mock_ec2_deprecated

From d2a234f75d67cda65372fef446601fd87f437d9a Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Fri, 8 Sep 2017 16:30:21 -0700
Subject: [PATCH 2/2] falling back to use nic'

---
 moto/ec2/responses/instances.py  | 8 ++++++++
 tests/test_ec2/test_instances.py | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py
index 257efc1f2..20c04668e 100644
--- a/moto/ec2/responses/instances.py
+++ b/moto/ec2/responses/instances.py
@@ -257,9 +257,13 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
           </monitoring>
           {% if instance.subnet_id %}
             <subnetId>{{ instance.subnet_id }}</subnetId>
+          {% elif instance.nics[0].subnet.id %}
+            <subnetId>{{ instance.nics[0].subnet.id }}</subnetId>
           {% endif %}
           {% if instance.vpc_id %}
             <vpcId>{{ instance.vpc_id }}</vpcId>
+          {% elif instance.nics[0].subnet.vpc_id %}
+            <vpcId>{{ instance.nics[0].subnet.vpc_id }}</vpcId>
           {% endif %}
           <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
           {% if instance.nics[0].public_ip %}
@@ -396,9 +400,13 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
                     </monitoring>
                     {% if instance.subnet_id %}
                       <subnetId>{{ instance.subnet_id }}</subnetId>
+                    {% elif instance.nics[0].subnet.id %}
+                      <subnetId>{{ instance.nics[0].subnet.id }}</subnetId>
                     {% endif %}
                     {% if instance.vpc_id %}
                       <vpcId>{{ instance.vpc_id }}</vpcId>
+                    {% elif instance.nics[0].subnet.vpc_id %}
+                      <vpcId>{{ instance.nics[0].subnet.vpc_id }}</vpcId>
                     {% endif %}
                     <privateIpAddress>{{ instance.private_ip }}</privateIpAddress>
                     {% if instance.nics[0].public_ip %}
diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py
index 04b8ba1e0..04e6a6daa 100644
--- a/tests/test_ec2/test_instances.py
+++ b/tests/test_ec2/test_instances.py
@@ -880,7 +880,6 @@ def test_run_instance_with_nic_autocreated():
     eni.private_ip_addresses.should.have.length_of(1)
     eni.private_ip_addresses[0].private_ip_address.should.equal(private_ip)
 
-
 @mock_ec2_deprecated
 def test_run_instance_with_nic_preexisting():
     conn = boto.connect_vpc('the_key', 'the_secret')