commit 3bd3d0fdac3c2e0079e69af05f32215d70c0a8f0
author YAMAMOTO Takashi <yamamoto@midokura.com> Mon Dec 12 11:14:58 2016 +0900
committer YAMAMOTO Takashi <yamamoto@midokura.com> Mon Dec 12 11:15:52 2016 +0900
tree 75be8230b349e06b14f8cbf5983569c0b14394ee
parent 691c71b04302a97c255b2bf6d02d435bf624cff8

tempest: Fix qos extension check

Fix issues introduced by the recent change. [1]

[1] I88e59cdbd79afb5337052ba3e5aecb96c7c8ea1c

Closes-Bug: #1649171
Change-Id: I2a2b627fd30ec564d8c8566fd3e46eb889e15dc9

neutron/tests/tempest/api/test_qos.py

diff --git a/neutron/tests/tempest/api/test_qos.py b/neutron/tests/tempest/api/test_qos.py
index 7752f94..395bda0 100644
--- a/neutron/tests/tempest/api/test_qos.py
+++ b/neutron/tests/tempest/api/test_qos.py
@@ -360,8 +360,8 @@
 
 class QosBandwidthLimitRuleTestJSON(base.BaseAdminNetworkTest):
     @classmethod
-    @base.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
     @test.requires_ext(extension="qos", service="network")
+    @base.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
     def resource_setup(cls):
         super(QosBandwidthLimitRuleTestJSON, cls).resource_setup()
 
@@ -772,8 +772,8 @@
     VALID_DSCP_MARK2 = 48
 
     @classmethod
-    @base.require_qos_rule_type(qos_consts.RULE_TYPE_DSCP_MARKING)
     @test.requires_ext(extension="qos", service="network")
+    @base.require_qos_rule_type(qos_consts.RULE_TYPE_DSCP_MARKING)
     def resource_setup(cls):
         super(QosDscpMarkingRuleTestJSON, cls).resource_setup()
 
@@ -906,8 +906,8 @@
     RULES_NAME = RULE_NAME + "s"
 
     @classmethod
-    @base.require_qos_rule_type(qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH)
     @test.requires_ext(extension="qos", service="network")
+    @base.require_qos_rule_type(qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH)
     def resource_setup(cls):
         super(QosMinimumBandwidthRuleTestJSON, cls).resource_setup()
 

neutron/tests/tempest/scenario/test_qos.py

diff --git a/neutron/tests/tempest/scenario/test_qos.py b/neutron/tests/tempest/scenario/test_qos.py
index f44e631..b558438 100644
--- a/neutron/tests/tempest/scenario/test_qos.py
+++ b/neutron/tests/tempest/scenario/test_qos.py
@@ -80,8 +80,8 @@
     FILE_PATH = "/tmp/img"
 
     @classmethod
-    @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
     @test.requires_ext(extension="qos", service="network")
+    @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
     def resource_setup(cls):
         super(QoSTest, cls).resource_setup()