x/vmware-nsx
Code Issues Proposed changes

Merge "NSX: fix migration for networks without a subnet"

Browse Source
This commit is contained in:
Jenkins 2014-04-30 04:51:34 +00:00 committed by Gerrit Code Review
commit aac8610d92
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/plugins/vmware/dhcp_meta/migration.py
View File

@ -155,10 +155,11 @@ class MigrationManager(object):
lsn_id, lsn_port_id = self.manager.lsn_port_get( lsn_id, lsn_port_id = self.manager.lsn_port_get(
context, network_id, subnet_id, raise_on_err=False) context, network_id, subnet_id, raise_on_err=False)
else: else:
subnet = self.validate(context, network_id) filters = {'network_id': [network_id]}
if subnet: subnets = self.plugin.get_subnets(context, filters=filters)
if subnets:
lsn_id, lsn_port_id = self.manager.lsn_port_get( 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: else:
lsn_id = self.manager.lsn_get(context, network_id, lsn_id = self.manager.lsn_get(context, network_id,
raise_on_err=False) raise_on_err=False)

4
neutron/tests/unit/vmware/test_dhcpmeta.py
View File

@ -218,7 +218,7 @@ class MigrationManagerTestCase(base.BaseTestCase):
'services': ['foo_lsn_id'], 'type': 'lsn'}) 'services': ['foo_lsn_id'], 'type': 'lsn'})
def _test_report_for_lsn_without_subnet(self, validated_subnet): 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): return_value=validated_subnet):
self.manager.manager.lsn_port_get.return_value = ( self.manager.manager.lsn_port_get.return_value = (
('foo_lsn_id', 'foo_lsn_port_id')) ('foo_lsn_id', 'foo_lsn_port_id'))
@ -230,7 +230,7 @@ class MigrationManagerTestCase(base.BaseTestCase):
self.assertEqual(expected, report) self.assertEqual(expected, report)
def test_report_for_lsn_without_subnet_subnet_found(self): 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): def test_report_for_lsn_without_subnet_subnet_not_found(self):
self.manager.manager.lsn_get.return_value = 'foo_lsn_id' self.manager.manager.lsn_get.return_value = 'foo_lsn_id'