From 254dbf3294c0f1edc4a2a469f556b3c4b3123a00 Mon Sep 17 00:00:00 2001 From: lihaijing Date: Thu, 21 Sep 2017 14:55:17 +0800 Subject: Fix 'project purge' deletes ALL images problem Closes-Bug: #1717130 Change-Id: I33c6fc7897dfee85d1c197a1267bde4abfa5bbd9 --- openstackclient/common/project_purge.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'openstackclient/common') diff --git a/openstackclient/common/project_purge.py b/openstackclient/common/project_purge.py index dff954e7..5b1d0072 100644 --- a/openstackclient/common/project_purge.py +++ b/openstackclient/common/project_purge.py @@ -95,7 +95,14 @@ class ProjectPurge(command.Command): # images try: image_client = self.app.client_manager.image - data = image_client.images.list(owner=project_id) + api_version = int(image_client.version) + if api_version == 1: + data = image_client.images.list(owner=project_id) + elif api_version == 2: + kwargs = {'filters': {'owner': project_id}} + data = image_client.images.list(**kwargs) + else: + raise NotImplementedError self.delete_objects( image_client.images.delete, data, 'image', dry_run) except Exception: -- cgit v1.2.1