summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-11-17 02:41:04 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-11-17 02:41:04 +0000
commitdb8c0a153df467c645df82b2ed6c2b282eae6850 (patch)
tree37d011eee48c1b7989fb10646aa4edaa27cd216e
parent5bd44c890be3fa5c632897c106409ff556e6a19a (diff)
downloadnova-db8c0a153df467c645df82b2ed6c2b282eae6850.tar.gz
nova-db8c0a153df467c645df82b2ed6c2b282eae6850.tar.xz
nova-db8c0a153df467c645df82b2ed6c2b282eae6850.zip
delete floating ips after tests
-rw-r--r--nova/tests/cloud_unittest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 938210fa7..2c6d9959b 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -94,18 +94,19 @@ class CloudTestCase(test.TrialTestCase):
def test_describe_addresses(self):
"""Makes sure describe addresses runs without raising an exception"""
address = "10.10.10.10"
- db.floating_ip_create(context.get_admin_context(),
+ db.floating_ip_create(self.context,
{'address': address,
'host': FLAGS.host})
self.cloud.allocate_address(self.context)
self.cloud.describe_addresses(self.context)
self.cloud.release_address(self.context,
public_ip=address)
+ db.floating_ip_destroy(self.context, address)
def test_associate_disassociate_address(self):
"""Verifies associate runs cleanly without raising an exception"""
address = "10.10.10.10"
- db.floating_ip_create(context.get_admin_context(),
+ db.floating_ip_create(self.context,
{'address': address,
'host': FLAGS.host})
self.cloud.allocate_address(self.context)
@@ -119,6 +120,7 @@ class CloudTestCase(test.TrialTestCase):
self.cloud.release_address(self.context,
public_ip=address)
db.instance_destroy(self.context, inst['id'])
+ db.floating_ip_destroy(self.context, address)
def test_console_output(self):
image_id = FLAGS.default_image