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] 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')