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

diff --git a/neutron/tests/api/base.py b/neutron/tests/api/base.py
index 2d1abf52db62185d5a7835d4de934f349d98ffd1..0f31a9a2a84a7eb437177fff424b35e6d0c312de 100644 (file)
--- 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,