openstack
/
neutron
Code Issues Proposed changes

Merge "tempest: Obey identity_feature_enabled.api_v2_admin in a few tests" into stable/newton

This commit is contained in:
Jenkins 2017-06-30 11:42:44 +00:00 committed by Gerrit Code Review
parent 7bdb6fbb07 735cd9d9ff
commit 998526a2b1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/tempest/api/admin/test_floating_ips_admin_actions.py
View File

@ -44,6 +44,9 @@ class FloatingIPAdminTestJSON(base.BaseAdminNetworkTest):
@test.attr(type='negative')
@test.idempotent_id('11116ee9-4e99-5b15-b8e1-aa7df92ca589')
def test_associate_floating_ip_with_port_from_another_tenant(self):
if not CONF.identity_feature_enabled.api_v2_admin:
# TODO(ihrachys) adopt to v3
raise self.skipException('Identity v2 admin not available')
body = self.admin_client.create_floatingip(
floating_network_id=self.ext_net_id)
floating_ip = body['floatingip']

6
neutron/tests/tempest/api/admin/test_quotas.py
View File

@ -19,6 +19,9 @@ from tempest.lib import exceptions as lib_exc
from tempest import test
from neutron.tests.tempest.api import base
from neutron.tests.tempest import config
CONF = config.CONF
class QuotasTestBase(base.BaseAdminNetworkTest):
@ -26,6 +29,9 @@ class QuotasTestBase(base.BaseAdminNetworkTest):
@classmethod
@test.requires_ext(extension="quotas", service="network")
def resource_setup(cls):
if not CONF.identity_feature_enabled.api_v2_admin:
# TODO(ihrachys) adopt to v3
raise cls.skipException('Identity v2 admin not available')
super(QuotasTestBase, cls).resource_setup()
def _create_tenant(self):