summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-04 14:45:19 +0000
committerGerrit Code Review <review@openstack.org>2013-01-04 14:45:19 +0000
commit80325d6897e9aadd0287e5e4e3fc3ada03448dac (patch)
treeae1e435115f48dcadfcffe329b82d5181d6f32e0 /nova/tests
parent8e71b1e1808523675e1779d2b7651ac1b9df902e (diff)
parentfa650b4d8756cd5411c5861b396d16a9ebd310df (diff)
Merge "Ensure that Quantum uses configured fixed IP"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/network/test_quantumv2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py
index 6cb0728a2..1eab23a03 100644
--- a/nova/tests/network/test_quantumv2.py
+++ b/nova/tests/network/test_quantumv2.py
@@ -399,7 +399,8 @@ class TestQuantumv2(test.TestCase):
else:
fixed_ip = fixed_ips.get(net_id)
if fixed_ip:
- port_req_body['port']['fixed_ip'] = fixed_ip
+ port_req_body['port']['fixed_ips'] = [{'ip_address':
+ fixed_ip}]
port_req_body['port']['network_id'] = net_id
port_req_body['port']['admin_state_up'] = True
port_req_body['port']['tenant_id'] = \