diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-21 23:00:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-21 23:00:57 +0000 |
| commit | 3161f87c44b200eb5fe5d540d5c75136190ac455 (patch) | |
| tree | 4ac16e860db4019fd604147746f46668ba75b64b /openstackclient/image/v1/image.py | |
| parent | 377c0ce0f73a961c0d013e10d85fcbd950f3d409 (diff) | |
| parent | 67dadda746759d8cf47822e6f426c473e46acc27 (diff) | |
| download | python-openstackclient-3161f87c44b200eb5fe5d540d5c75136190ac455.tar.gz | |
Merge "Remove deprecated image commands"
Diffstat (limited to 'openstackclient/image/v1/image.py')
| -rw-r--r-- | openstackclient/image/v1/image.py | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py index 64c4049c..caf3d54f 100644 --- a/openstackclient/image/v1/image.py +++ b/openstackclient/image/v1/image.py @@ -182,29 +182,16 @@ class CreateImage(command.ShowOne): help=_("Set a property on this image " "(repeat option to set multiple properties)"), ) - # NOTE(dtroyer): --owner is deprecated in Jan 2016 in an early - # 2.x release. Do not remove before Jan 2017 - # and a 3.x release. - project_group = parser.add_mutually_exclusive_group() - project_group.add_argument( + parser.add_argument( "--project", metavar="<project>", help=_("Set an alternate project on this image (name or ID)"), ) - project_group.add_argument( - "--owner", - metavar="<project>", - help=argparse.SUPPRESS, - ) return parser def take_action(self, parsed_args): image_client = self.app.client_manager.image - if getattr(parsed_args, 'owner', None) is not None: - LOG.warning(_('The --owner option is deprecated, ' - 'please use --project instead.')) - # Build an attribute dict from the parsed args, only include # attributes that were actually set on the command line kwargs = {} @@ -599,29 +586,16 @@ class SetImage(command.Command): metavar="<checksum>", help=_("Image hash used for verification"), ) - # NOTE(dtroyer): --owner is deprecated in Jan 2016 in an early - # 2.x release. Do not remove before Jan 2017 - # and a 3.x release. - project_group = parser.add_mutually_exclusive_group() - project_group.add_argument( + parser.add_argument( "--project", metavar="<project>", help=_("Set an alternate project on this image (name or ID)"), ) - project_group.add_argument( - "--owner", - metavar="<project>", - help=argparse.SUPPRESS, - ) return parser def take_action(self, parsed_args): image_client = self.app.client_manager.image - if getattr(parsed_args, 'owner', None) is not None: - LOG.warning(_('The --owner option is deprecated, ' - 'please use --project instead.')) - kwargs = {} copy_attrs = ('name', 'owner', 'min_disk', 'min_ram', 'properties', 'container_format', 'disk_format', 'size', 'store', |