summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2010-07-22 12:30:28 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2010-07-22 12:30:28 -0700
commit4a9bc4c92aaedf28ab167bdbf7ca4f81b75a0add (patch)
tree2e1d3639b8ebdf0a623d88c0c0f55a52e514f6be
parentf5e19272844f2f0d2c72bf55a2bdf533f40d1ea5 (diff)
parent3142fec2c908689f02e4e24a5174a3dcf2260c4c (diff)
downloadnova-4a9bc4c92aaedf28ab167bdbf7ca4f81b75a0add.tar.gz
nova-4a9bc4c92aaedf28ab167bdbf7ca4f81b75a0add.tar.xz
nova-4a9bc4c92aaedf28ab167bdbf7ca4f81b75a0add.zip
Merged fix for bug 608505 so unit tests pass
-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 f3a5868d1..a1d1789e2 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -137,7 +137,7 @@ class NetworkTestCase(test.TrialTestCase):
self.dnsmasq.release_ip(mac3, address3, hostname, net.bridge_name)
net = network.get_project_network("project0", "default")
rv = network.deallocate_ip(secondaddress)
- self.dnsmasq.release_ip(mac, address, hostname, net.bridge_name)
+ self.dnsmasq.release_ip(mac, secondaddress, hostname, net.bridge_name)
def test_release_before_deallocate(self):
pass