openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Ihar Hrachyshka 2015-08-07 13:50:07 +02:00
parent 0a0b4c53c0
commit 06368a0019
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/api/base.py
View File

@ -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,