openstack/neutron
Code Issues Proposed changes

Merge "Add a test csnat port removing in DVR migration"

Browse Source
This commit is contained in:
Jenkins 2017-10-11 18:52:22 +00:00 committed by Gerrit Code Review
commit 1e29513d47
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/unit/db/test_l3_dvr_db.py
View File

@ -495,7 +495,7 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
self.ctx, filters=csnat_filters)
self.assertEqual(1, len(csnat_ports))
def test_distributed_to_centralized_csnat_ports_removal(self):
def _test_csnat_ports_removal(self, ha=False):
router_dict = {'name': 'test_router', 'admin_state_up': True,
'distributed': True}
router = self._create_router(router_dict)
@ -523,12 +523,18 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
{'router': {'admin_state_up': False}})
self.mixin.update_router(
self.ctx, router['id'],
{'router': {'distributed': False}})
{'router': {'distributed': False, 'ha': ha}})
csnat_ports = self.core_plugin.get_ports(
self.ctx, filters=csnat_filters)
self.assertEqual(0, len(csnat_ports))
def test_distributed_to_centralized_csnat_ports_removal(self):
self._test_csnat_ports_removal()
def test_distributed_to_ha_csnat_ports_removal(self):
self._test_csnat_ports_removal(ha=True)
def test_remove_router_interface_csnat_ports_removal(self):
router_dict = {'name': 'test_router', 'admin_state_up': True,
'distributed': True}