openstack
/
neutron
Code Issues Proposed changes

Merge "Fix 404 error fetching metadata when using DVR"

This commit is contained in:
Jenkins 2014-08-13 23:16:11 +00:00 committed by Gerrit Code Review
parent ce2d3ffd9e 338171c114
commit 09c22e53d0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,8 @@ class MetadataProxyHandler(object):
internal_ports = qclient.list_ports(
device_id=router_id,
device_owner=n_const.DEVICE_OWNER_ROUTER_INTF)['ports']
device_owner=[n_const.DEVICE_OWNER_ROUTER_INTF,
n_const.DEVICE_OWNER_DVR_INTERFACE])['ports']
return tuple(p['network_id'] for p in internal_ports)
@utils.cache_method_results

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

@ -27,6 +27,12 @@ from neutron.common import utils
from neutron.tests import base
EXPECTED_OWNER_ROUTERS = [
constants.DEVICE_OWNER_ROUTER_INTF,
constants.DEVICE_OWNER_DVR_INTERFACE
]
class FakeConf(object):
admin_user = 'neutron'
admin_password = 'password'
@ -104,7 +110,7 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
networks = self.handler._get_router_networks(router_id)
mock_list_ports.assert_called_once_with(
device_id=router_id,
device_owner=constants.DEVICE_OWNER_ROUTER_INTF)
device_owner=EXPECTED_OWNER_ROUTERS)
self.assertEqual(expected, networks)
def _test_get_router_networks_twice_helper(self):
@ -119,7 +125,7 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
networks = self.handler._get_router_networks(router_id)
mock_list_ports.assert_called_once_with(
device_id=router_id,
device_owner=constants.DEVICE_OWNER_ROUTER_INTF)
device_owner=EXPECTED_OWNER_ROUTERS)
self.assertEqual(expected_networks, networks)
networks = self.handler._get_router_networks(router_id)
@ -232,7 +238,7 @@ class TestMetadataProxyHandlerCache(base.BaseTestCase):
new_qclient_call,
mock.call().list_ports(
device_id=router_id,
device_owner=constants.DEVICE_OWNER_ROUTER_INTF
device_owner=EXPECTED_OWNER_ROUTERS
)
])