Fix deletion of network quotas
Network quotas could be deleted after deletion of project. This
caused the cleanup to fail as network quotas have to be deleted
before the deletion of project.
This fix makes sure that network quotas are deleted before the
deletion of project.
Change-Id: I8576e2c6f1ae6dc90850dd3d8eade7c10942e413
diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index 5b3b72a..acd4124 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -1039,6 +1039,8 @@
project_associated_services.append(NovaQuotaService)
if IS_CINDER:
project_associated_services.append(VolumeQuotaService)
+ if IS_NEUTRON:
+ project_associated_services.append(NetworkQuotaService)
return project_associated_services
@@ -1067,7 +1069,6 @@
resource_cleanup_services.append(NetworkService)
resource_cleanup_services.append(NetworkSecGroupService)
resource_cleanup_services.append(NetworkSubnetPoolsService)
- resource_cleanup_services.append(NetworkQuotaService)
if IS_CINDER:
resource_cleanup_services.append(SnapshotService)
resource_cleanup_services.append(VolumeService)