Merge "Add dependency between FloatingIP and RouterGateway"

diff --cc heat/tests/test_quantum.py
index c0d46d4ed3759ab56d8ef87ad479c755082984d7,ec1f913e643998d030a0eeffce4b1893125ea20f..123ea01f21d6efd5593b0ce66ca123acfda0d778
--- 1/heat/tests/test_quantum.py
--- 2/heat/tests/test_quantum.py
+++ b/heat/tests/test_quantum.py
@@@ -621,9 -634,14 +631,14 @@@ class QuantumFloatingIPTest(HeatTestCas
          t = template_format.parse(quantum_floating_template)
          stack = parse_stack(t)
  
+         # assert the implicit dependency between the floating_ip
+         # and the gateway
+         deps = stack.dependencies[stack['gateway']]
+         self.assertIn(stack['floating_ip'], deps)
+ 
          fip = stack['floating_ip']
          scheduler.TaskRunner(fip.create)()
 -        self.assertEqual(floatingip.FloatingIP.CREATE_COMPLETE, fip.state)
 +        self.assertEqual((fip.CREATE, fip.COMPLETE), fip.state)
          fip.validate()
  
          fip_id = fip.FnGetRefId()