commit 89826b1d4794ebbc6b0db6c5e1e40a4c3d5226c3
author Jenkins <jenkins@review.openstack.org> Mon Jul 25 21:33:42 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 25 21:33:42 2016 +0000
tree 92ef241e76ace57b9524cb2e4c11c098f01a915e
parent 6e18bef4698bcc821cf580a6bd7ec8de5c99cb38
parent a70710bb36fd334e30bb2f927398a693e43d4d24

Merge "Don't enable DHCP on floating IP subnet tests"

tempest/api/network/test_floating_ips.py

diff --git a/tempest/api/network/test_floating_ips.py b/tempest/api/network/test_floating_ips.py
index 2abbf93..c64b01e 100644
--- a/tempest/api/network/test_floating_ips.py
+++ b/tempest/api/network/test_floating_ips.py
@@ -54,7 +54,7 @@
 
         # Create network, subnet, router and add interface
         cls.network = cls.create_network()
-        cls.subnet = cls.create_subnet(cls.network)
+        cls.subnet = cls.create_subnet(cls.network, enable_dhcp=False)
         cls.router = cls.create_router(data_utils.rand_name('router-'),
                                        external_network_id=cls.ext_net_id)
         cls.create_router_interface(cls.router['id'], cls.subnet['id'])