summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-11-17 02:23:20 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-11-17 02:23:20 +0000
commit5bd44c890be3fa5c632897c106409ff556e6a19a (patch)
tree6a3504b49ab71dccc826ed0d0a5ccbd852694d31
parent7b4733b36d5351a2ba42c82b4d2b821a3b1d12cd (diff)
downloadnova-5bd44c890be3fa5c632897c106409ff556e6a19a.tar.gz
nova-5bd44c890be3fa5c632897c106409ff556e6a19a.tar.xz
nova-5bd44c890be3fa5c632897c106409ff556e6a19a.zip
fix leaking floating ip from network unittests and use of fakeldap driver
-rw-r--r--nova/tests/network_unittest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index b7caed4fd..6f4705719 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -41,7 +41,6 @@ class NetworkTestCase(test.TrialTestCase):
# flags in the corresponding section in nova-dhcpbridge
self.flags(connection_type='fake',
fake_network=True,
- auth_driver='nova.auth.ldapdriver.FakeLdapDriver',
network_size=16,
num_networks=5)
logging.getLogger().setLevel(logging.DEBUG)
@@ -127,6 +126,7 @@ class NetworkTestCase(test.TrialTestCase):
self.network.deallocate_floating_ip(self.context, float_addr)
self.network.deallocate_fixed_ip(self.context, fix_addr)
release_ip(fix_addr)
+ db.floating_ip_destroy(context.get_admin_context(), float_addr)
def test_allocate_deallocate_fixed_ip(self):
"""Makes sure that we can allocate and deallocate a fixed ip"""