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
(cherry picked from commit 5e843850527ede7a56fcc24753f87c1e9e3e8bed)

diff --git a/neutron/plugins/vmware/dhcp_meta/migration.py b/neutron/plugins/vmware/dhcp_meta/migration.py
index 992a88346b771255a05dd817c6d4a3fc5a6e8589..0f1b32b771c7268bed20db3e40667fe07c5da7ee 100644 (file)
--- a/neutron/plugins/vmware/dhcp_meta/migration.py
+++ b/neutron/plugins/vmware/dhcp_meta/migration.py
@@ -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."""

diff --git a/neutron/tests/unit/vmware/test_dhcpmeta.py b/neutron/tests/unit/vmware/test_dhcpmeta.py
index 088cb2ddfec452e7a8e9b597e62331160757355d..ec1e408c1873d59a986699f80f47ba99dab9d64b 100644 (file)
--- a/neutron/tests/unit/vmware/test_dhcpmeta.py
+++ b/neutron/tests/unit/vmware/test_dhcpmeta.py
@@ -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)