NSX: do not raise on missing router during migration step
Return None for missing router rather raising NotFound exception; this is what the client code was expected to handle in the first place. Closes-bug: 1313918 Change-Id: I573770a69d0170b027fc990c29aaa87b1fc8eccc
This commit is contained in:
parent
5f889fb49c
commit
776c2031a9
@ -58,8 +58,6 @@ class DhcpMetadataBuilder(object):
|
||||
for port in ports:
|
||||
if port['fixed_ips'][0]['subnet_id'] == subnet['id']:
|
||||
return port['device_id']
|
||||
else:
|
||||
raise n_exc.NotFound()
|
||||
|
||||
def metadata_deallocate(self, context, router_id, subnet_id):
|
||||
"""Deallocate metadata services for the subnet."""
|
||||
|
@ -71,6 +71,11 @@ class DhcpMetadataBuilderTestCase(base.BaseTestCase):
|
||||
def test_router_id_get_none_subnet(self):
|
||||
self.assertIsNone(self.builder.router_id_get(mock.ANY, None))
|
||||
|
||||
def test_router_id_get_none_no_router(self):
|
||||
self.builder.plugin.get_ports.return_value = []
|
||||
subnet = {'network_id': self.network_id}
|
||||
self.assertIsNone(self.builder.router_id_get(mock.ANY, subnet))
|
||||
|
||||
def test_metadata_deallocate(self):
|
||||
self.builder.metadata_deallocate(
|
||||
mock.ANY, self.router_id, self.subnet_id)
|
||||
|
Loading…
x
Reference in New Issue
Block a user