From 06368a001932a748fa78a6bb1f8419a5b78ee515 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Aug 2015 13:50:07 +0200 Subject: [PATCH] Clean up QoS rules first, then QoS policies Since policy deletion kills all rules by CASCADE, cleaning rules up after policies is basically no-op. Instead, let's swap the order and in that way implicitly cover rule deletions. Change-Id: Id3a7d8ddf5599a532e3d5609d94522579f85b938 Partially-Implements: blueprint quantum-qos-api --- neutron/tests/api/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neutron/tests/api/base.py b/neutron/tests/api/base.py index 2d1abf52d..0f31a9a2a 100644 --- a/neutron/tests/api/base.py +++ b/neutron/tests/api/base.py @@ -117,14 +117,14 @@ class BaseNetworkTest(neutron.tests.tempest.test.BaseTestCase): for vpnservice in cls.vpnservices: cls._try_delete_resource(cls.client.delete_vpnservice, vpnservice['id']) - # Clean up QoS policies - for qos_policy in cls.qos_policies: - cls._try_delete_resource(cls.admin_client.delete_qos_policy, - qos_policy['id']) # Clean up QoS rules for qos_rule in cls.qos_rules: cls._try_delete_resource(cls.admin_client.delete_qos_rule, qos_rule['id']) + # Clean up QoS policies + for qos_policy in cls.qos_policies: + cls._try_delete_resource(cls.admin_client.delete_qos_policy, + qos_policy['id']) # Clean up floating IPs for floating_ip in cls.floating_ips: cls._try_delete_resource(cls.client.delete_floatingip, -- 2.45.2