From 97b841130d12063f7abd73b328cd9bd6be42e845 Mon Sep 17 00:00:00 2001 From: Lukas Piwowarski Date: Wed, 25 Mar 2020 13:57:30 +0000 Subject: [PATCH] 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 --- tempest/cmd/cleanup_service.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py index 5b3b72ad24..acd4124907 100644 --- a/tempest/cmd/cleanup_service.py +++ b/tempest/cmd/cleanup_service.py @@ -1039,6 +1039,8 @@ def get_project_associated_cleanup_services(): 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 @@ def get_resource_cleanup_services(): 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)