commit 3d13f07ed64c3f8c5ae1b6366600841366e713d2
author Zuul <zuul@review.opendev.org> Mon Apr 13 17:01:14 2020 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 13 17:01:14 2020 +0000
tree e6f671f31164624739810f95434e36570776e494
parent 26062e4ac9dc6192aa053ba7d45d2a62d6f9475a
parent 97b841130d12063f7abd73b328cd9bd6be42e845

Merge "Fix deletion of network quotas"

tempest/cmd/cleanup_service.py

diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index 9b591bc..469b214 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -1048,6 +1048,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
 
 
@@ -1076,7 +1078,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)