diff options
| author | lihaijing <lihaijing@fiberhome.com> | 2017-09-21 14:55:17 +0800 |
|---|---|---|
| committer | David Rabel <rabel@b1-systems.de> | 2017-11-02 16:38:04 +0000 |
| commit | b9c5094ede503109955eb90fe0007e343f7bb903 (patch) | |
| tree | 13a4d284f4172ff7b689fadf03291e384736e358 /openstackclient/common | |
| parent | fcf928eaaa55068564de183ea2fc266e5d035a34 (diff) | |
| download | python-openstackclient-b9c5094ede503109955eb90fe0007e343f7bb903.tar.gz | |
Fix 'project purge' deletes ALL images problem
Closes-Bug: #1717130
Change-Id: I33c6fc7897dfee85d1c197a1267bde4abfa5bbd9
(cherry picked from commit 254dbf3294c0f1edc4a2a469f556b3c4b3123a00)
Diffstat (limited to 'openstackclient/common')
| -rw-r--r-- | openstackclient/common/project_purge.py | 9 |
1 files changed, 8 insertions, 1 deletions
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: |