summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 10:11:51 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 10:11:51 +0000
commit6f1e3fef17b6b7e01946da7f6e757daf400e52b6 (patch)
tree2f0de8680cd68590d37cb1c39050fc98e19d5cbf
parent0363b21eff13114e51023458550ed2b45de1dfa8 (diff)
parent578ca25ace1009bc7235d714785849d4327bb864 (diff)
Merge "Fix tempest router migration test when HA enabled, v2" into stable/newton
-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 420fcd8..4679c5c 100644
--- a/neutron/tests/tempest/api/test_revisions.py
+++ b/neutron/tests/tempest/api/test_revisions.py
@@ -312,17 +312,21 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
312 312
313 @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49') 313 @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
314 @test.requires_ext(extension="router", service="network") 314 @test.requires_ext(extension="router", service="network")
315 @test.requires_ext(extension="dvr", service="network") 315 @test.requires_ext(extension="l3-ha", service="network")
316 def test_update_router_extra_attributes_bumps_revision(self): 316 def test_update_router_extra_attributes_bumps_revision(self):
317 router = self.create_router(router_name='r1') 317 # updates from CVR to CVR-HA are supported on every release,
318 # but only the admin can forcibly create a non-HA router
319 router_args = {'tenant_id': self.client.tenant_id,
320 'ha': False}
321 router = self.admin_client.create_router('r1', True,
322 **router_args)['router']
318 self.addCleanup(self.client.delete_router, router['id']) 323 self.addCleanup(self.client.delete_router, router['id'])
319 self.assertIn('revision_number', router) 324 self.assertIn('revision_number', router)
320 rev1 = router['revision_number'] 325 rev1 = router['revision_number']
321 router = self.admin_client.update_router( 326 router = self.admin_client.update_router(
322 router['id'], admin_state_up=False)['router'] 327 router['id'], admin_state_up=False)['router']
323 self.assertGreater(router['revision_number'], rev1) 328 self.assertGreater(router['revision_number'], rev1)
324 self.admin_client.update_router(router['id'], 329 self.admin_client.update_router(router['id'], ha=True)['router']
325 distributed=True)['router']
326 updated = self.client.show_router(router['id'])['router'] 330 updated = self.client.show_router(router['id'])['router']
327 self.assertGreater(updated['revision_number'], 331 self.assertGreater(updated['revision_number'],
328 router['revision_number']) 332 router['revision_number'])