diff --git a/neutron/plugins/vmware/dhcp_meta/migration.py b/neutron/plugins/vmware/dhcp_meta/migration.py index cda14c5743..992a88346b 100644 --- a/neutron/plugins/vmware/dhcp_meta/migration.py +++ b/neutron/plugins/vmware/dhcp_meta/migration.py @@ -155,10 +155,11 @@ class MigrationManager(object): lsn_id, lsn_port_id = self.manager.lsn_port_get( context, network_id, subnet_id, raise_on_err=False) else: - subnet = self.validate(context, network_id) - if subnet: + filters = {'network_id': [network_id]} + subnets = self.plugin.get_subnets(context, filters=filters) + if subnets: lsn_id, lsn_port_id = self.manager.lsn_port_get( - context, network_id, subnet['id'], raise_on_err=False) + context, network_id, subnets[0]['id'], raise_on_err=False) else: lsn_id = self.manager.lsn_get(context, network_id, raise_on_err=False) diff --git a/neutron/tests/unit/vmware/test_dhcpmeta.py b/neutron/tests/unit/vmware/test_dhcpmeta.py index c83a326e6a..31cb01da82 100644 --- a/neutron/tests/unit/vmware/test_dhcpmeta.py +++ b/neutron/tests/unit/vmware/test_dhcpmeta.py @@ -218,7 +218,7 @@ class MigrationManagerTestCase(base.BaseTestCase): 'services': ['foo_lsn_id'], 'type': 'lsn'}) def _test_report_for_lsn_without_subnet(self, validated_subnet): - with mock.patch.object(self.manager, 'validate', + with mock.patch.object(self.manager.plugin, 'get_subnets', return_value=validated_subnet): self.manager.manager.lsn_port_get.return_value = ( ('foo_lsn_id', 'foo_lsn_port_id')) @@ -230,7 +230,7 @@ class MigrationManagerTestCase(base.BaseTestCase): self.assertEqual(expected, report) def test_report_for_lsn_without_subnet_subnet_found(self): - self._test_report_for_lsn_without_subnet({'id': self.subnet_id}) + self._test_report_for_lsn_without_subnet([{'id': self.subnet_id}]) def test_report_for_lsn_without_subnet_subnet_not_found(self): self.manager.manager.lsn_get.return_value = 'foo_lsn_id'