diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 14:45:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 14:45:19 +0000 |
| commit | 80325d6897e9aadd0287e5e4e3fc3ada03448dac (patch) | |
| tree | ae1e435115f48dcadfcffe329b82d5181d6f32e0 | |
| parent | 8e71b1e1808523675e1779d2b7651ac1b9df902e (diff) | |
| parent | fa650b4d8756cd5411c5861b396d16a9ebd310df (diff) | |
| download | nova-80325d6897e9aadd0287e5e4e3fc3ada03448dac.tar.gz nova-80325d6897e9aadd0287e5e4e3fc3ada03448dac.tar.xz nova-80325d6897e9aadd0287e5e4e3fc3ada03448dac.zip | |
Merge "Ensure that Quantum uses configured fixed IP"
| -rw-r--r-- | nova/network/quantumv2/api.py | 3 | ||||
| -rw-r--r-- | nova/tests/network/test_quantumv2.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 3a20e1ed0..88431b91d 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -136,7 +136,8 @@ class API(base.Base): touched_port_ids.append(port['id']) else: if fixed_ips.get(network_id): - port_req_body['port']['fixed_ip'] = fixed_ip + port_req_body['port']['fixed_ips'] = [{'ip_address': + fixed_ip}] port_req_body['port']['network_id'] = network_id port_req_body['port']['admin_state_up'] = True port_req_body['port']['tenant_id'] = instance['project_id'] 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'] = \ |