openstack/neutron
Code Issues Proposed changes

Merge "Revert "Fix tempest router migration test when HA enabled""

Browse Source
This commit is contained in:
Jenkins 2017-05-05 21:27:47 +00:00 committed by Gerrit Code Review
commit 4cd57e4b9e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/tests/tempest/api/test_revisions.py
View File

@ -313,20 +313,17 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
@decorators.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49') @decorators.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
@test.requires_ext(extension="router", service="network") @test.requires_ext(extension="router", service="network")
@test.requires_ext(extension="dvr", service="network")
def test_update_router_extra_attributes_bumps_revision(self): def test_update_router_extra_attributes_bumps_revision(self):
# updates from CVR to CVR-HA are supported on every release, router = self.create_router(router_name='r1')
# but only the admin can forcibly create a non-HA router
router_args = {'tenant_id': self.client.tenant_id,
'ha': False}
router = self.admin_client.create_router('r1', True,
**router_args)['router']
self.addCleanup(self.client.delete_router, router['id']) self.addCleanup(self.client.delete_router, router['id'])
self.assertIn('revision_number', router) self.assertIn('revision_number', router)
rev1 = router['revision_number'] rev1 = router['revision_number']
router = self.admin_client.update_router( router = self.admin_client.update_router(
router['id'], admin_state_up=False)['router'] router['id'], admin_state_up=False)['router']
self.assertGreater(router['revision_number'], rev1) self.assertGreater(router['revision_number'], rev1)
self.admin_client.update_router(router['id'], ha=True)['router'] self.admin_client.update_router(router['id'],
distributed=True)['router']
updated = self.client.show_router(router['id'])['router'] updated = self.client.show_router(router['id'])['router']
self.assertGreater(updated['revision_number'], self.assertGreater(updated['revision_number'],
router['revision_number']) router['revision_number'])