diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-22 17:12:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-22 17:12:46 +0000 |
| commit | 2a284ea97b4c778e15916a7544395cafa761ec89 (patch) | |
| tree | c843705836ef075f9c81ae1406c21f48adca12a6 /nova | |
| parent | b7912c60f82b4745d3705e56fb025ba7d5d4948c (diff) | |
| parent | bedaf1caefa7310e595c76fb12f60368ad90b718 (diff) | |
| download | nova-2a284ea97b4c778e15916a7544395cafa761ec89.tar.gz nova-2a284ea97b4c778e15916a7544395cafa761ec89.tar.xz nova-2a284ea97b4c778e15916a7544395cafa761ec89.zip | |
Merge "fix floating ip test that wasn't running"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_floating_ips.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py index a72430fd9..efc9b36cc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py @@ -380,16 +380,16 @@ class FloatingIpTest(test.TestCase): floating_ips = ["10.10.10.10", "10.10.10.11"] if floating_address not in floating_ips: raise exception.FloatingIpNotFoundForAddress( - address=flaoting_address) + address=floating_address) - self.stubs.Set(network.api.API, "associate_floating_ip", - fake_network_api_associate) + self.stubs.Set(network.api.API, "associate_floating_ip", + fake_network_api_associate) - body = dict(addFloatingIp=dict(address='1.1.1.1')) - req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') - self.assertRaises(webob.exc.HTTPNotFound, - self.manager._add_floating_ip, - req, 'test_inst', body) + body = dict(addFloatingIp=dict(address='1.1.1.1')) + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') + self.assertRaises(webob.exc.HTTPNotFound, + self.manager._add_floating_ip, + req, 'test_inst', body) def test_floating_ip_disassociate_non_existent_ip(self): def network_api_get_floating_ip_by_address(self, context, @@ -400,7 +400,7 @@ class FloatingIpTest(test.TestCase): address=floating_address) self.stubs.Set(network.api.API, "get_floating_ip_by_address", - network_api_get_floating_ip_by_address) + network_api_get_floating_ip_by_address) body = dict(removeFloatingIp=dict(address='1.1.1.1')) req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') |