openstack/nova
Code Issues Proposed changes

Merge "Ensure that Quantum uses configured fixed IP"

Browse Source
This commit is contained in:
Jenkins 2013-01-04 14:45:19 +00:00 committed by Gerrit Code Review
commit 80325d6897
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/network/quantumv2/api.py
View File

@ -136,7 +136,8 @@ class API(base.Base):
touched_port_ids.append(port['id']) touched_port_ids.append(port['id'])
else: else:
if fixed_ips.get(network_id): 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']['network_id'] = network_id
port_req_body['port']['admin_state_up'] = True port_req_body['port']['admin_state_up'] = True
port_req_body['port']['tenant_id'] = instance['project_id'] port_req_body['port']['tenant_id'] = instance['project_id']

3
nova/tests/network/test_quantumv2.py
View File

@ -399,7 +399,8 @@ class TestQuantumv2(test.TestCase):
else: else:
fixed_ip = fixed_ips.get(net_id) fixed_ip = fixed_ips.get(net_id)
if fixed_ip: 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']['network_id'] = net_id
port_req_body['port']['admin_state_up'] = True port_req_body['port']['admin_state_up'] = True
port_req_body['port']['tenant_id'] = \ port_req_body['port']['tenant_id'] = \