commit daab26ff6c8e701abc02ae4b019695a6a890ed3c
author Jenkins <jenkins@review.openstack.org> Fri Sep 09 20:24:09 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Sep 09 20:24:10 2016 +0000
tree e197b4ae28b63114cd7886ab1d5d9606e7214833
parent 347e79bb2eefefd20f9cbe4305c46abf49cf8564
parent 11cfe2495d31d39bfd0ac6ccf73942158ea1c4ca

Merge "Use correct exception in L3 driver controller"

neutron/tests/tempest/api/admin/test_routers_flavors.py

diff --git a/neutron/tests/tempest/api/admin/test_routers_flavors.py b/neutron/tests/tempest/api/admin/test_routers_flavors.py
index 3e214e1..9b6f06f 100644
--- a/neutron/tests/tempest/api/admin/test_routers_flavors.py
+++ b/neutron/tests/tempest/api/admin/test_routers_flavors.py
@@ -71,3 +71,9 @@
         self.create_router('name', flavor_id=self.flavor['id'])
         with testtools.ExpectedException(lib_exc.Conflict):
             self.admin_client.delete_flavor(self.flavor['id'])
+
+    @test.idempotent_id('83939cf7-5070-41bc-9a3e-cd9f22df2186')
+    def test_badrequest_on_requesting_flags_and_flavor(self):
+        with testtools.ExpectedException(lib_exc.BadRequest):
+            self.admin_client.create_router(
+                'name', flavor_id=self.flavor['id'], distributed=True)