From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 19 Jun 2013 17:46:43 +0000 (+0000)
Subject: Merge "Add dependency between FloatingIP and RouterGateway"
X-Git-Tag: 2014.1~460
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=665d2023063d84d734963d70a19eb7fcb633348e;p=openstack-build%2Fheat-build.git

Merge "Add dependency between FloatingIP and RouterGateway"
---

665d2023063d84d734963d70a19eb7fcb633348e
diff --cc heat/tests/test_quantum.py
index c0d46d4e,ec1f913e..123ea01f
--- a/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()