summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 10:12:08 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 10:12:08 +0000
commitb99239e06eb63a3dbe656b534526ddb7a9781ae5 (patch)
treef510ecd8577c56f8795b60aeeb967f73f14af83f
parent9220204ffbeddd5c3a0cd42c7e62dd10c3909c86 (diff)
parent5c5a6e1bbadb77197f086e598949283ad9b81fea (diff)
Merge "Fix tempest router migration test when HA enabled, v2" into stable/ocata
-rw-r--r--neutron/tests/tempest/api/test_revisions.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/neutron/tests/tempest/api/test_revisions.py b/neutron/tests/tempest/api/test_revisions.py
index 63d5c60..96df884 100644
--- a/neutron/tests/tempest/api/test_revisions.py
+++ b/neutron/tests/tempest/api/test_revisions.py
@@ -311,17 +311,21 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
311 311
312 @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49') 312 @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
313 @test.requires_ext(extension="router", service="network") 313 @test.requires_ext(extension="router", service="network")
314 @test.requires_ext(extension="dvr", service="network") 314 @test.requires_ext(extension="l3-ha", service="network")
315 def test_update_router_extra_attributes_bumps_revision(self): 315 def test_update_router_extra_attributes_bumps_revision(self):
316 router = self.create_router(router_name='r1') 316 # updates from CVR to CVR-HA are supported on every release,
317 # but only the admin can forcibly create a non-HA router
318 router_args = {'tenant_id': self.client.tenant_id,
319 'ha': False}
320 router = self.admin_client.create_router('r1', True,
321 **router_args)['router']
317 self.addCleanup(self.client.delete_router, router['id']) 322 self.addCleanup(self.client.delete_router, router['id'])
318 self.assertIn('revision_number', router) 323 self.assertIn('revision_number', router)
319 rev1 = router['revision_number'] 324 rev1 = router['revision_number']
320 router = self.admin_client.update_router( 325 router = self.admin_client.update_router(
321 router['id'], admin_state_up=False)['router'] 326 router['id'], admin_state_up=False)['router']
322 self.assertGreater(router['revision_number'], rev1) 327 self.assertGreater(router['revision_number'], rev1)
323 self.admin_client.update_router(router['id'], 328 self.admin_client.update_router(router['id'], ha=True)['router']
324 distributed=True)['router']
325 updated = self.client.show_router(router['id'])['router'] 329 updated = self.client.show_router(router['id'])['router']
326 self.assertGreater(updated['revision_number'], 330 self.assertGreater(updated['revision_number'],
327 router['revision_number']) 331 router['revision_number'])