diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-27 05:27:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-27 05:27:52 +0000 |
| commit | 2476a995cf7a228890b6182ca8e29e3cd1fc6def (patch) | |
| tree | 08c484825b5998b7de0286aa13ef5e77740844aa /openstackclient/common | |
| parent | 2c77aba3633c6ac6a365e0a32f71127a8cbcca38 (diff) | |
| parent | 254dbf3294c0f1edc4a2a469f556b3c4b3123a00 (diff) | |
| download | python-openstackclient-2476a995cf7a228890b6182ca8e29e3cd1fc6def.tar.gz | |
Merge "Fix 'project purge' deletes ALL images problem"
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: |