openstack
/
nova
Code Issues Proposed changes

neutron: only get port id when listing ports in validate_networks 

The validate_networks method is called from the compute API before
casting off to build instances. If the project has a lot of ports, the
list call to neutron can be slow, so we should optimize this method as
much as possible. One way to do that is rather than get the port details
back, we just get the id since all we care about is the number of ports
assigned to the project.

Closes-Bug: #1521788

Change-Id: Icddba161112526dde23184ee80ad5cb60fe66cc6
This commit is contained in:
Matt Riedemann 2015-12-06 06:51:11 -08:00
parent bf027800f7
commit 768887b6fc
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/neutronv2/api.py
View File

@ -1184,7 +1184,9 @@ class API(base_api.NetworkAPI):
# Unlimited Port Quota
return num_instances
ports = neutron.list_ports(tenant_id=context.project_id)['ports']
# We only need the port count so only ask for ids back.
params = dict(tenant_id=context.project_id, fields=['id'])
ports = neutron.list_ports(**params)['ports']
free_ports = quotas.get('port') - len(ports)
if free_ports < 0:
msg = (_("The number of defined ports: %(ports)d "

24
nova/tests/unit/network/test_neutronv2.py
View File

@ -1466,7 +1466,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 50}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': []})
self.mox.ReplayAll()
api = neutronapi.API()
@ -1494,7 +1495,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 50}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': []})
self.mox.ReplayAll()
api = neutronapi.API()
@ -1533,7 +1535,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 50}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': []})
self.mox.ReplayAll()
api = neutronapi.API()
@ -1726,7 +1729,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 2}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': self.port_data2})
self.mox.ReplayAll()
api = neutronapi.API()
@ -1751,7 +1755,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 5}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': self.port_data2})
self.mox.ReplayAll()
api = neutronapi.API()
@ -1788,7 +1793,8 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn(
{'quota': {'port': 5}})
self.moxed_client.list_ports(tenant_id='my_tenantid').AndReturn(
self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn(
{'ports': self.port_data2})
self.mox.ReplayAll()
api = neutronapi.API()
@ -2897,7 +2903,7 @@ class TestNeutronv2WithMock(test.TestCase):
'fields': 'device_id'},
{'ports': []}),
({'tenant_id': 'fake-project'},
({'tenant_id': 'fake-project', 'fields': ['id']},
{'ports': [1, 2, 3, 4, 5]})]
nets = [{'subnets': '1'}, {'subnets': '2'}]
@ -2940,7 +2946,7 @@ class TestNeutronv2WithMock(test.TestCase):
'fixed_ips': 'ip_address=10.0.1.2',
'fields': 'device_id'},
{'ports': []}),
({'tenant_id': 'fake-project'},
({'tenant_id': 'fake-project', 'fields': ['id']},
{'ports': []})]
self._test_validate_networks_fixed_ip_no_dup(nets1, requested_networks,
ids, list_port_values)
@ -2970,7 +2976,7 @@ class TestNeutronv2WithMock(test.TestCase):
'fields': 'device_id'},
{'ports': []}),
({'tenant_id': 'fake-project'},
({'tenant_id': 'fake-project', 'fields': ['id']},
{'ports': []})]
self._test_validate_networks_fixed_ip_no_dup(nets2, requested_networks,