x/vmware-nsx
Code Issues Proposed changes

Avoid RequestURITooLong exception in metadata agent

Browse Source 
Length of API port query is proportional to number of networks
and may exceed URI limit. The solution is to query ports by
given ip address only and then filter them by network_id.

Closes bug 1348097

Change-Id: I2a87d6b215df380b24dd5ebb24947e8729f3f6fb
This commit is contained in:
Ilya Shakhat 2014-07-24 15:14:26 +04:00
parent b7681c30f5
commit fe8ffa295f
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/agent/metadata/agent.py
View File

@ -157,11 +157,12 @@ class MetadataProxyHandler(object):
""" """
qclient = self._get_neutron_client() qclient = self._get_neutron_client()
all_ports = qclient.list_ports(
return qclient.list_ports(
network_id=networks,
fixed_ips=['ip_address=%s' % remote_address])['ports'] fixed_ips=['ip_address=%s' % remote_address])['ports']
networks = set(networks)
return [p for p in all_ports if p['network_id'] in networks]
def _get_ports(self, remote_address, network_id=None, router_id=None): def _get_ports(self, remote_address, network_id=None, router_id=None):
"""Search for all ports that contain passed ip address and belongs to """Search for all ports that contain passed ip address and belongs to
given network. given network.

31
neutron/tests/unit/test_metadata_agent.py
View File

@ -130,27 +130,29 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
def test_get_ports_for_remote_address(self): def test_get_ports_for_remote_address(self):
remote_address = 'remote_address' remote_address = 'remote_address'
networks = 'networks' networks = ('network_id1', 'network_id3')
fixed_ips = ["ip_address=%s" % remote_address] fixed_ips = ["ip_address=%s" % remote_address]
expected_ports = [{'network_id': 'network_id1', 'something': 42}]
mock_list_ports = self.qclient.return_value.list_ports
mock_list_ports.return_value = {'ports': [{'network_id': 'network_id1',
'something': 42},
{'network_id': 'network_id2',
'something_else': 64}]}
ports = self.handler._get_ports_for_remote_address(remote_address, ports = self.handler._get_ports_for_remote_address(remote_address,
networks) networks)
mock_list_ports = self.qclient.return_value.list_ports mock_list_ports.assert_called_once_with(fixed_ips=fixed_ips)
mock_list_ports.assert_called_once_with( self.assertEqual(expected_ports, ports)
network_id=networks, fixed_ips=fixed_ips)
self.assertEqual(mock_list_ports.return_value.__getitem__('ports'),
ports)
def _get_ports_for_remote_address_cache_hit_helper(self): def _get_ports_for_remote_address_cache_hit_helper(self):
remote_address = 'remote_address' remote_address = 'remote_address'
networks = ('net1', 'net2') networks = ('net1', 'net2')
fixed_ips = ["ip_address=%s" % remote_address] fixed_ips = ["ip_address=%s" % remote_address]
ports = self.handler._get_ports_for_remote_address(remote_address,
networks)
mock_list_ports = self.qclient.return_value.list_ports mock_list_ports = self.qclient.return_value.list_ports
mock_list_ports.return_value = {'ports': [{'network_id': 'net1',
'something': 42}]}
self.handler._get_ports_for_remote_address(remote_address, networks)
mock_list_ports.assert_called_once_with( mock_list_ports.assert_called_once_with(
network_id=networks, fixed_ips=fixed_ips) fixed_ips=fixed_ips)
self.assertEqual(
mock_list_ports.return_value.__getitem__('ports'), ports)
self.assertEqual(1, mock_list_ports.call_count) self.assertEqual(1, mock_list_ports.call_count)
self.handler._get_ports_for_remote_address(remote_address, self.handler._get_ports_for_remote_address(remote_address,
networks) networks)
@ -237,7 +239,6 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
expected.extend([ expected.extend([
new_qclient_call, new_qclient_call,
mock.call().list_ports( mock.call().list_ports(
network_id=networks or tuple(),
fixed_ips=['ip_address=192.168.1.1']) fixed_ips=['ip_address=192.168.1.1'])
]) ])
@ -254,7 +255,8 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
networks = ('net1', 'net2') networks = ('net1', 'net2')
ports = [ ports = [
[{'network_id': 'net1'}, {'network_id': 'net2'}], [{'network_id': 'net1'}, {'network_id': 'net2'}],
[{'device_id': 'device_id', 'tenant_id': 'tenant_id'}] [{'device_id': 'device_id', 'tenant_id': 'tenant_id',
'network_id': 'net1'}]
] ]
self.assertEqual( self.assertEqual(
@ -290,7 +292,8 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
ports = [ ports = [
[{'device_id': 'device_id', [{'device_id': 'device_id',
'tenant_id': 'tenant_id'}] 'tenant_id': 'tenant_id',
'network_id': 'the_id'}]
] ]
self.assertEqual( self.assertEqual(