commit 6cffb905b32afe085a195b408b0f39c7a197dd3a
author Jenkins <jenkins@review.openstack.org> Wed Nov 02 17:21:08 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 02 17:21:08 2016 +0000
tree 20b74d6b872cfa68f24bb3d7d95915b6647f212c
parent 67b820890e7d8d16a85196179495590c36f245fe
parent 82d0c12a8ee4b0d2689c0a1a487b513d5defb404

Merge "Make the non ha router usage explicit in a dvr test"

tempest/api/network/admin/test_routers_dvr.py

diff --git a/tempest/api/network/admin/test_routers_dvr.py b/tempest/api/network/admin/test_routers_dvr.py
index 36cb15f..7de3760 100644
--- a/tempest/api/network/admin/test_routers_dvr.py
+++ b/tempest/api/network/admin/test_routers_dvr.py
@@ -95,9 +95,11 @@
         """
         name = data_utils.rand_name('router')
         # router needs to be in admin state down in order to be upgraded to DVR
+        # l3ha routers are not upgradable to dvr, make it explicitly non ha
         router = self.admin_routers_client.create_router(name=name,
                                                          distributed=False,
-                                                         admin_state_up=False)
+                                                         admin_state_up=False,
+                                                         ha=False)
         self.addCleanup(self.admin_routers_client.delete_router,
                         router['router']['id'])
         self.assertFalse(router['router']['distributed'])