From 95d7525ca15d7de9007343c2dc63e0d7eab3bd3f Mon Sep 17 00:00:00 2001 From: zhufl Date: Wed, 28 Mar 2018 09:55:04 +0800 Subject: [PATCH] Set max_microversion 2.35 for nova security group tests The compute os-security-groups API is deprecated from the Microversion 2.36, so we should set max_microversion = '2.35' for compute security group tests. Implements blueprint: clear-deprecated-api Change-Id: I2084ddcac0f8b4b9f81e5263ac4058939418626d --- tempest/api/compute/admin/test_quotas_negative.py | 13 ++++++++++--- .../admin/test_security_group_default_rules.py | 1 + tempest/api/compute/admin/test_security_groups.py | 1 + tempest/api/compute/security_groups/base.py | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tempest/api/compute/admin/test_quotas_negative.py b/tempest/api/compute/admin/test_quotas_negative.py index 5ef7ee4de6..f90ff924a5 100644 --- a/tempest/api/compute/admin/test_quotas_negative.py +++ b/tempest/api/compute/admin/test_quotas_negative.py @@ -22,12 +22,12 @@ from tempest.lib import exceptions as lib_exc CONF = config.CONF -class QuotasAdminNegativeTestJSON(base.BaseV2ComputeAdminTest): +class QuotasAdminNegativeTestBase(base.BaseV2ComputeAdminTest): force_tenant_isolation = True @classmethod def setup_clients(cls): - super(QuotasAdminNegativeTestJSON, cls).setup_clients() + super(QuotasAdminNegativeTestBase, cls).setup_clients() cls.client = cls.os_primary.quotas_client cls.adm_client = cls.os_admin.quotas_client cls.sg_client = cls.security_groups_client @@ -35,7 +35,7 @@ class QuotasAdminNegativeTestJSON(base.BaseV2ComputeAdminTest): @classmethod def resource_setup(cls): - super(QuotasAdminNegativeTestJSON, cls).resource_setup() + super(QuotasAdminNegativeTestBase, cls).resource_setup() # NOTE(afazekas): these test cases should always create and use a new # tenant most of them should be skipped if we can't do that cls.demo_tenant_id = cls.client.tenant_id @@ -51,6 +51,9 @@ class QuotasAdminNegativeTestJSON(base.BaseV2ComputeAdminTest): self.addCleanup(self.adm_client.update_quota_set, self.demo_tenant_id, **{quota_item: default_quota_value}) + +class QuotasAdminNegativeTest(QuotasAdminNegativeTestBase): + @decorators.attr(type=['negative']) @decorators.idempotent_id('733abfe8-166e-47bb-8363-23dbd7ff3476') def test_update_quota_normal_user(self): @@ -85,6 +88,10 @@ class QuotasAdminNegativeTestJSON(base.BaseV2ComputeAdminTest): self.assertRaises((lib_exc.Forbidden, lib_exc.OverLimit), self.create_test_server) + +class QuotasSecurityGroupAdminNegativeTest(QuotasAdminNegativeTestBase): + max_microversion = '2.35' + @decorators.skip_because(bug="1186354", condition=CONF.service_available.neutron) @decorators.attr(type=['negative']) diff --git a/tempest/api/compute/admin/test_security_group_default_rules.py b/tempest/api/compute/admin/test_security_group_default_rules.py index f2f3b573e2..bca6a22e27 100644 --- a/tempest/api/compute/admin/test_security_group_default_rules.py +++ b/tempest/api/compute/admin/test_security_group_default_rules.py @@ -23,6 +23,7 @@ CONF = config.CONF class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): + max_microversion = '2.35' @classmethod # TODO(GMann): Once Bug# 1311500 is fixed, these test can run diff --git a/tempest/api/compute/admin/test_security_groups.py b/tempest/api/compute/admin/test_security_groups.py index ff9caa3b4f..f0178aa032 100644 --- a/tempest/api/compute/admin/test_security_groups.py +++ b/tempest/api/compute/admin/test_security_groups.py @@ -20,6 +20,7 @@ from tempest.lib import decorators class SecurityGroupsTestAdminJSON(base.BaseV2ComputeAdminTest): + max_microversion = '2.35' @classmethod def setup_clients(cls): diff --git a/tempest/api/compute/security_groups/base.py b/tempest/api/compute/security_groups/base.py index 54a6da8c26..49125d1f47 100644 --- a/tempest/api/compute/security_groups/base.py +++ b/tempest/api/compute/security_groups/base.py @@ -22,6 +22,7 @@ CONF = config.CONF class BaseSecurityGroupsTest(base.BaseV2ComputeTest): + max_microversion = '2.35' @classmethod def skip_checks(cls):