Remove deprecated commands from shell

Remove all deprecated commands from the shell
since they are no longer used and to keep
the command line menu from looking cluttered.

Closes-bug: #1314218

Change-Id: I66e82872988e3835e4f290f48dfc80538271426c

7 files changed, 3 insertions, 1258 deletions

diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index c066f53..f55375c 100644
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -27,7 +27,6 @@ import os
 from os.path import expanduser
 import sys
 
-import netaddr
 import six.moves.urllib.parse as urlparse
 
 import glanceclient
@@ -134,11 +133,6 @@ class OpenStackImagesShell(object):
                             default=utils.env('OS_PROJECT_DOMAIN_NAME'),
                             help='Defaults to env[OS_PROJECT_DOMAIN_NAME].')
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-I',
-                            dest='os_username',
-                            help='DEPRECATED! Use --os-username.')
-
         parser.add_argument('--os-password',
                             default=utils.env('OS_PASSWORD'),
                             help='Defaults to env[OS_PASSWORD].')
@@ -146,11 +140,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_password',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-K',
-                            dest='os_password',
-                            help='DEPRECATED! Use --os-password.')
-
         parser.add_argument('--os-tenant-id',
                             default=utils.env('OS_TENANT_ID'),
                             help='Defaults to env[OS_TENANT_ID].')
@@ -165,11 +154,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_tenant_name',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-T',
-                            dest='os_tenant_name',
-                            help='DEPRECATED! Use --os-tenant-name.')
-
         parser.add_argument('--os-auth-url',
                             default=utils.env('OS_AUTH_URL'),
                             help='Defaults to env[OS_AUTH_URL].')
@@ -177,11 +161,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_auth_url',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-N',
-                            dest='os_auth_url',
-                            help='DEPRECATED! Use --os-auth-url.')
-
         parser.add_argument('--os-region-name',
                             default=utils.env('OS_REGION_NAME'),
                             help='Defaults to env[OS_REGION_NAME].')
@@ -189,11 +168,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_region_name',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-R',
-                            dest='os_region_name',
-                            help='DEPRECATED! Use --os-region-name.')
-
         parser.add_argument('--os-auth-token',
                             default=utils.env('OS_AUTH_TOKEN'),
                             help='Defaults to env[OS_AUTH_TOKEN].')
@@ -201,11 +175,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_auth_token',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-A', '--auth_token',
-                            dest='os_auth_token',
-                            help='DEPRECATED! Use --os-auth-token.')
-
         parser.add_argument('--os-service-type',
                             default=utils.env('OS_SERVICE_TYPE'),
                             help='Defaults to env[OS_SERVICE_TYPE].')
@@ -271,36 +240,6 @@ class OpenStackImagesShell(object):
                             help='Prevent select actions from requesting '
                             'user confirmation.')
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('--dry-run',
-                            default=False,
-                            action='store_true',
-                            help='DEPRECATED! Only used for deprecated '
-                            'legacy commands.')
-
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('--ssl',
-                            dest='use_ssl',
-                            default=False,
-                            action='store_true',
-                            help='DEPRECATED! Send a fully-formed endpoint '
-                            'using --os-image-url instead.')
-
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-H', '--host',
-                            metavar='ADDRESS',
-                            help='DEPRECATED! Send a fully-formed endpoint '
-                            'using --os-image-url instead.')
-
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-p', '--port',
-                            dest='port',
-                            metavar='PORT',
-                            type=int,
-                            default=9292,
-                            help='DEPRECATED! Send a fully-formed endpoint '
-                            'using --os-image-url instead.')
-
         parser.add_argument('--os-image-url',
                             default=utils.env('OS_IMAGE_URL'),
                             help='Defaults to env[OS_IMAGE_URL].')
@@ -308,11 +247,6 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_image_url',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-U', '--url',
-                            dest='os_image_url',
-                            help='DEPRECATED! Use --os-image-url.')
-
         parser.add_argument('--os-image-api-version',
                             default=utils.env('OS_IMAGE_API_VERSION',
                                               default='1'),
@@ -321,12 +255,7 @@ class OpenStackImagesShell(object):
         parser.add_argument('--os_image_api_version',
                             help=argparse.SUPPRESS)
 
-        #NOTE(bcwaldon): DEPRECATED
-        parser.add_argument('-S', '--os_auth_strategy',
-                            help='DEPRECATED! This option is '
-                            'completely ignored.')
-
-        # FIXME(bobt): this method should come from python-keystoneclient
+       # FIXME(bobt): this method should come from python-keystoneclient
         self._append_global_identity_args(parser)
 
         return parser
@@ -374,12 +303,6 @@ class OpenStackImagesShell(object):
         """
         if args.os_image_url:
             return args.os_image_url
-        elif args.host:
-            # Check if it is legal ipv6 address, if so, need wrap it with '[]'
-            if netaddr.valid_ipv6(args.host):
-                args.host = '[%s]' % args.host
-            scheme = 'https' if args.use_ssl else 'http'
-            return '%s://%s:%s/' % (scheme, args.host, args.port)
         else:
             return None
 
diff --git a/glanceclient/v1/legacy_shell.py b/glanceclient/v1/legacy_shell.py
deleted file mode 100644
index 02f1ea3..0000000
--- a/glanceclient/v1/legacy_shell.py
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 2012 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-DEPRECATED functions that implement the same command line interface as the
-legacy glance client.
-"""
-
-from __future__ import print_function
-
-import argparse
-import sys
-
-from six.moves.urllib import parse
-
-from glanceclient.common import utils
-from glanceclient.openstack.common import strutils
-
-
-SUCCESS = 0
-FAILURE = 1
-
-
-def get_image_fields_from_args(args):
-    """
-    Validate the set of arguments passed as field name/value pairs
-    and return them as a mapping.
-    """
-    fields = {}
-    for arg in args:
-        pieces = arg.strip(',').split('=')
-        if len(pieces) != 2:
-            msg = ("Arguments should be in the form of field=value. "
-                   "You specified %s." % arg)
-            raise RuntimeError(msg)
-        fields[pieces[0]] = pieces[1]
-
-    return fields
-
-
-def get_image_filters_from_args(args):
-    """Build a dictionary of query filters based on the supplied args."""
-    try:
-        fields = get_image_fields_from_args(args)
-    except RuntimeError as e:
-        print(e)
-        return FAILURE
-
-    SUPPORTED_FILTERS = ['name', 'disk_format', 'container_format', 'status',
-                         'min_ram', 'min_disk', 'size_min', 'size_max',
-                         'changes-since']
-    filters = {}
-    for (key, value) in fields.items():
-        if key not in SUPPORTED_FILTERS:
-            key = 'property-%s' % (key,)
-        filters[key] = value
-
-    return filters
-
-
-def print_image_formatted(client, image):
-    """
-    Formatted print of image metadata.
-
-    :param client: The Glance client object
-    :param image: The image metadata
-    """
-    uri_parts = parse.urlparse(client.http_client.endpoint)
-    if uri_parts.port:
-        hostbase = "%s:%s" % (uri_parts.hostname, uri_parts.port)
-    else:
-        hostbase = uri_parts.hostname
-    print("URI: %s://%s/v1/images/%s" % (uri_parts.scheme, hostbase, image.id))
-    print("Id: %s" % image.id)
-    print("Public: " + (image.is_public and "Yes" or "No"))
-    print("Protected: " + (image.protected and "Yes" or "No"))
-    print("Name: %s" % getattr(image, 'name', ''))
-    print("Status: %s" % image.status)
-    print("Size: %d" % int(image.size))
-    print("Disk format: %s" % getattr(image, 'disk_format', ''))
-    print("Container format: %s" % getattr(image, 'container_format', ''))
-    print("Minimum Ram Required (MB): %s" % image.min_ram)
-    print("Minimum Disk Required (GB): %s" % image.min_disk)
-    if hasattr(image, 'owner'):
-        print("Owner: %s" % image.owner)
-    if len(image.properties) > 0:
-        for k, v in image.properties.items():
-            print("Property '%s': %s" % (k, v))
-    print("Created at: %s" % image.created_at)
-    if hasattr(image, 'deleted_at'):
-        print("Deleted at: %s" % image.deleted_at)
-    if hasattr(image, 'updated_at'):
-        print("Updated at: %s" % image.updated_at)
-
-
-@utils.arg('--silent-upload', action="store_true",
-           help="DEPRECATED! Animations are always off.")
-@utils.arg('fields', default=[], nargs='*', help=argparse.SUPPRESS)
-def do_add(gc, args):
-    """DEPRECATED! Use image-create instead."""
-    try:
-        fields = get_image_fields_from_args(args.fields)
-    except RuntimeError as e:
-        print(e)
-        return FAILURE
-
-    image_meta = {
-        'is_public': strutils.bool_from_string(
-            fields.pop('is_public', 'False')),
-        'protected': strutils.bool_from_string(
-            fields.pop('protected', 'False')),
-        'min_disk': fields.pop('min_disk', 0),
-        'min_ram': fields.pop('min_ram', 0),
-    }
-
-    #NOTE(bcwaldon): Use certain properties only if they are explicitly set
-    optional = ['id', 'name', 'disk_format', 'container_format']
-    for field in optional:
-        if field in fields:
-            image_meta[field] = fields.pop(field)
-
-    # Strip any args that are not supported
-    unsupported_fields = ['status', 'size']
-    for field in unsupported_fields:
-        if field in fields.keys():
-            print('Found non-settable field %s. Removing.' % field)
-            fields.pop(field)
-
-    # We need either a location or image data/stream to add...
-    image_data = None
-    if 'location' in fields.keys():
-        image_meta['location'] = fields.pop('location')
-        if 'checksum' in fields.keys():
-            image_meta['checksum'] = fields.pop('checksum')
-    elif 'copy_from' in fields.keys():
-        image_meta['copy_from'] = fields.pop('copy_from')
-    else:
-        # Grab the image data stream from stdin or redirect,
-        # otherwise error out
-        image_data = sys.stdin
-
-    image_meta['data'] = image_data
-
-    # allow owner to be set when image is created
-    if 'owner' in fields.keys():
-        image_meta['owner'] = fields.pop('owner')
-
-    # Add custom attributes, which are all the arguments remaining
-    image_meta['properties'] = fields
-
-    if not args.dry_run:
-        image = gc.images.create(**image_meta)
-        print("Added new image with ID: %s" % image.id)
-        if args.verbose:
-            print("Returned the following metadata for the new image:")
-            for k, v in sorted(image.to_dict().items()):
-                print(" %(k)30s => %(v)s" % {'k': k, 'v': v})
-    else:
-        print("Dry run. We would have done the following:")
-
-        def _dump(dict):
-            for k, v in sorted(dict.items()):
-                print(" %(k)30s => %(v)s" % {'k': k, 'v': v})
-
-        print("Add new image with metadata:")
-        _dump(image_meta)
-
-    return SUCCESS
-
-
-@utils.arg('id', metavar='<IMAGE_ID>', help='ID of image to describe.')
-@utils.arg('fields', default=[], nargs='*', help=argparse.SUPPRESS)
-def do_update(gc, args):
-    """DEPRECATED! Use image-update instead."""
-    try:
-        fields = get_image_fields_from_args(args.fields)
-    except RuntimeError as e:
-        print(e)
-        return FAILURE
-
-    image_meta = {}
-
-    # Strip any args that are not supported
-    nonmodifiable_fields = ['created_at', 'deleted_at', 'deleted',
-                            'updated_at', 'size', 'status']
-    for field in nonmodifiable_fields:
-        if field in fields.keys():
-            print('Found non-modifiable field %s. Removing.' % field)
-            fields.pop(field)
-
-    base_image_fields = ['disk_format', 'container_format', 'name',
-                         'min_disk', 'min_ram', 'location', 'owner',
-                         'copy_from']
-    for field in base_image_fields:
-        fvalue = fields.pop(field, None)
-        if fvalue is not None:
-            image_meta[field] = fvalue
-
-    # Have to handle "boolean" values specially...
-    if 'is_public' in fields:
-        image_meta['is_public'] = strutils.\
-            bool_from_string(fields.pop('is_public'))
-    if 'protected' in fields:
-        image_meta['protected'] = strutils.\
-            bool_from_string(fields.pop('protected'))
-
-    # Add custom attributes, which are all the arguments remaining
-    image_meta['properties'] = fields
-
-    if not args.dry_run:
-        image = gc.images.update(args.id, **image_meta)
-        print("Updated image %s" % args.id)
-
-        if args.verbose:
-            print("Updated image metadata for image %s:" % args.id)
-            print_image_formatted(gc, image)
-    else:
-        def _dump(dict):
-            for k, v in sorted(dict.items()):
-                print(" %(k)30s => %(v)s" % {'k': k, 'v': v})
-
-        print("Dry run. We would have done the following:")
-        print("Update existing image with metadata:")
-        _dump(image_meta)
-
-    return SUCCESS
-
-
-@utils.arg('id', metavar='<IMAGE_ID>', help='ID of image to describe.')
-def do_delete(gc, args):
-    """DEPRECATED! Use image-delete instead."""
-    if not (args.force or
-            user_confirm("Delete image %s?" % args.id, default=False)):
-        print('Not deleting image %s' % args.id)
-        return FAILURE
-
-    gc.images.get(args.id).delete()
-
-
-@utils.arg('id', metavar='<IMAGE_ID>', help='ID of image to describe.')
-def do_show(gc, args):
-    """DEPRECATED! Use image-show instead."""
-    image = gc.images.get(args.id)
-    print_image_formatted(gc, image)
-    return SUCCESS
-
-
-def _get_images(gc, args):
-    parameters = {
-        'filters': get_image_filters_from_args(args.filters),
-        'page_size': args.limit,
-    }
-
-    optional_kwargs = ['marker', 'sort_key', 'sort_dir']
-    for kwarg in optional_kwargs:
-        value = getattr(args, kwarg, None)
-        if value is not None:
-            parameters[kwarg] = value
-
-    return gc.images.list(**parameters)
-
-
-@utils.arg('--limit', dest="limit", metavar="LIMIT", default=10,
-           type=int, help="Page size for image metadata requests.")
-@utils.arg('--marker', dest="marker", metavar="MARKER",
-           default=None, help="Image index after which to begin pagination.")
-@utils.arg('--sort_key', dest="sort_key", metavar="KEY",
-           help="Sort results by this image attribute.")
-@utils.arg('--sort_dir', dest="sort_dir", metavar="[desc|asc]",
-           help="Sort results in this direction.")
-@utils.arg('filters', default=[], nargs='*', help=argparse.SUPPRESS)
-def do_index(gc, args):
-    """DEPRECATED! Use image-list instead."""
-    images = _get_images(gc, args)
-
-    if not images:
-        return SUCCESS
-
-    pretty_table = PrettyTable()
-    pretty_table.add_column(36, label="ID")
-    pretty_table.add_column(30, label="Name")
-    pretty_table.add_column(20, label="Disk Format")
-    pretty_table.add_column(20, label="Container Format")
-    pretty_table.add_column(14, label="Size", just="r")
-
-    print(pretty_table.make_header())
-
-    for image in images:
-        print(pretty_table.make_row(image.id,
-                                    image.name,
-                                    image.disk_format,
-                                    image.container_format,
-                                    image.size))
-
-
-@utils.arg('--limit', dest="limit", metavar="LIMIT", default=10,
-           type=int, help="Page size for image metadata requests.")
-@utils.arg('--marker', dest="marker", metavar="MARKER",
-           default=None, help="Image index after which to begin pagination.")
-@utils.arg('--sort_key', dest="sort_key", metavar="KEY",
-           help="Sort results by this image attribute.")
-@utils.arg('--sort_dir', dest="sort_dir", metavar="[desc|asc]",
-           help="Sort results in this direction.")
-@utils.arg('filters', default='', nargs='*', help=argparse.SUPPRESS)
-def do_details(gc, args):
-    """DEPRECATED! Use image-list instead."""
-    images = _get_images(gc, args)
-    for i, image in enumerate(images):
-        if i == 0:
-            print("=" * 80)
-        print_image_formatted(gc, image)
-        print("=" * 80)
-
-
-def do_clear(gc, args):
-    """DEPRECATED!"""
-    if not (args.force or
-            user_confirm("Delete all images?", default=False)):
-        print('Not deleting any images')
-        return FAILURE
-
-    images = gc.images.list()
-    for image in images:
-        if args.verbose:
-            print('Deleting image %s "%s" ...' % (image.id, image.name),
-                  end=' ')
-        try:
-            image.delete()
-            if args.verbose:
-                print('done')
-        except Exception as e:
-            print('Failed to delete image %s' % image.id)
-            print(e)
-            return FAILURE
-    return SUCCESS
-
-
-@utils.arg('image_id', help='Image ID to filters members with.')
-def do_image_members(gc, args):
-    """DEPRECATED! Use member-list instead."""
-    members = gc.image_members.list(image=args.image_id)
-    sharers = 0
-    # Output the list of members
-    for memb in members:
-        can_share = ''
-        if memb.can_share:
-            can_share = ' *'
-            sharers += 1
-        print("%s%s" % (memb.member_id, can_share))
-
-    # Emit a footnote
-    if sharers > 0:
-        print("\n(*: Can share image)")
-
-
-@utils.arg('--can-share', default=False, action="store_true",
-           help="Allow member to further share image.")
-@utils.arg('member_id',
-           help='ID of member (typically tenant) to grant access.')
-def do_member_images(gc, args):
-    """DEPRECATED! Use member-list instead."""
-    members = gc.image_members.list(member=args.member_id)
-
-    if not len(members):
-        print("No images shared with member %s" % args.member_id)
-        return SUCCESS
-
-    sharers = 0
-    # Output the list of images
-    for memb in members:
-        can_share = ''
-        if memb.can_share:
-            can_share = ' *'
-            sharers += 1
-        print("%s%s" % (memb.image_id, can_share))
-
-    # Emit a footnote
-    if sharers > 0:
-        print("\n(*: Can share image)")
-
-
-@utils.arg('--can-share', default=False, action="store_true",
-           help="Allow member to further share image.")
-@utils.arg('image_id', help='ID of image to describe.')
-@utils.arg('member_id',
-           help='ID of member (typically tenant) to grant access.')
-def do_members_replace(gc, args):
-    """DEPRECATED!"""
-    if not args.dry_run:
-        for member in gc.image_members.list(image=args.image_id):
-            gc.image_members.delete(args.image_id, member.member_id)
-        gc.image_members.create(args.image_id, args.member_id, args.can_share)
-    else:
-        print("Dry run. We would have done the following:")
-        print('Replace members of image %s with "%s"'
-              % (args.image_id, args.member_id))
-        if args.can_share:
-            print("New member would have been able to further share image.")
-
-
-@utils.arg('--can-share', default=False, action="store_true",
-           help="Allow member to further share image.")
-@utils.arg('image_id', help='ID of image to describe.')
-@utils.arg('member_id',
-           help='ID of member (typically tenant) to grant access.')
-def do_member_add(gc, args):
-    """DEPRECATED! Use member-create instead."""
-    if not args.dry_run:
-        gc.image_members.create(args.image_id, args.member_id, args.can_share)
-    else:
-        print("Dry run. We would have done the following:")
-        print('Add "%s" to membership of image %s' %
-              (args.member_id, args.image_id))
-        if args.can_share:
-            print("New member would have been able to further share image.")
-
-
-def user_confirm(prompt, default=False):
-    """
-    Yes/No question dialog with user.
-
-    :param prompt: question/statement to present to user (string)
-    :param default: boolean value to return if empty string
-                    is received as response to prompt
-
-    """
-    if default:
-        prompt_default = "[Y/n]"
-    else:
-        prompt_default = "[y/N]"
-
-    # for bug 884116, don't issue the prompt if stdin isn't a tty
-    if not (hasattr(sys.stdin, 'isatty') and sys.stdin.isatty()):
-        return default
-
-    answer = raw_input("%s %s " % (prompt, prompt_default))
-
-    if answer == "":
-        return default
-    else:
-        return answer.lower() in ("yes", "y")
-
-
-class PrettyTable(object):
-    """Creates an ASCII art table
-
-    Example:
-
-        ID  Name              Size         Hits
-        --- ----------------- ------------ -----
-        122 image                       22     0
-    """
-    def __init__(self):
-        self.columns = []
-
-    def add_column(self, width, label="", just='l'):
-        """Add a column to the table
-
-        :param width: number of characters wide the column should be
-        :param label: column heading
-        :param just: justification for the column, 'l' for left,
-                     'r' for right
-        """
-        self.columns.append((width, label, just))
-
-    def make_header(self):
-        label_parts = []
-        break_parts = []
-        for width, label, _ in self.columns:
-            # NOTE(sirp): headers are always left justified
-            label_part = self._clip_and_justify(label, width, 'l')
-            label_parts.append(label_part)
-
-            break_part = '-' * width
-            break_parts.append(break_part)
-
-        label_line = ' '.join(label_parts)
-        break_line = ' '.join(break_parts)
-        return '\n'.join([label_line, break_line])
-
-    def make_row(self, *args):
-        row = args
-        row_parts = []
-        for data, (width, _, just) in zip(row, self.columns):
-            row_part = self._clip_and_justify(data, width, just)
-            row_parts.append(row_part)
-
-        row_line = ' '.join(row_parts)
-        return row_line
-
-    @staticmethod
-    def _clip_and_justify(data, width, just):
-        # clip field to column width
-        clipped_data = str(data)[:width]
-
-        if just == 'r':
-            # right justify
-            justified = clipped_data.rjust(width)
-        else:
-            # left justify
-            justified = clipped_data.ljust(width)
-
-        return justified
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py
index 10c12c1..7c5d289 100644
--- a/glanceclient/v1/shell.py
+++ b/glanceclient/v1/shell.py
@@ -26,9 +26,6 @@ from glanceclient import exc
 from glanceclient.openstack.common import strutils
 import glanceclient.v1.images
 
-#NOTE(bcwaldon): import deprecated cli functions
-from glanceclient.v1.legacy_shell import *
-
 CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.'
 DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
                 'qcow2, vdi, and iso.')
@@ -213,7 +210,7 @@ def do_image_create(gc, args):
     # Filter out None values
     fields = dict(filter(lambda x: x[1] is not None, vars(args).items()))
 
-    fields['is_public'] = fields.get('is_public') or fields.pop('public')
+    fields['is_public'] = fields.get('is_public')
 
     if 'is_protected' in fields:
         fields['protected'] = fields.pop('is_protected')
@@ -386,9 +383,4 @@ def do_member_create(gc, args):
 def do_member_delete(gc, args):
     """Remove a shared image from a tenant."""
     image_id = utils.find_resource(gc.images, args.image).id
-    if not args.dry_run:
-        gc.image_members.delete(image_id, args.tenant_id)
-    else:
-        print("Dry run. We would have done the following:")
-        print('Remove "%s" from the member list of image '
-              '"%s"' % (args.tenant_id, args.image))
+    gc.image_members.delete(image_id, args.tenant_id)
diff --git a/tests/test_shell.py b/tests/test_shell.py
index 29445fa..5c80e49 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -107,17 +107,6 @@ class ShellTest(utils.TestCase):
         # Convert ArgumentPaser to string first.
         self.assertEqual(str(expected), str(actual_parser))
 
-    def test_get_image_url_by_ipv6Addr_host(self):
-        fake_args = lambda: None
-        setattr(fake_args, 'os_image_url', None)
-        setattr(fake_args, 'host', '2011:2013:1:f101::1')
-        setattr(fake_args, 'use_ssl', True)
-        setattr(fake_args, 'port', '9292')
-        expected_image_url = 'https://[2011:2013:1:f101::1]:9292/'
-        test_shell = openstack_shell.OpenStackImagesShell()
-        targeted_image_url = test_shell._get_image_url(fake_args)
-        self.assertEqual(expected_image_url, targeted_image_url)
-
     @mock.patch.object(openstack_shell.OpenStackImagesShell,
                        '_get_versioned_client')
     def test_cert_and_key_args_interchangeable(self,
diff --git a/tests/v1/test_images.py b/tests/v1/test_images.py
index e63634f..5c1be09 100644
--- a/tests/v1/test_images.py
+++ b/tests/v1/test_images.py
@@ -15,7 +15,6 @@
 
 import errno
 import json
-import sys
 import testtools
 
 import six
@@ -23,7 +22,6 @@ from six.moves.urllib import parse
 
 from glanceclient.v1 import client
 from glanceclient.v1 import images
-from glanceclient.v1 import legacy_shell
 from glanceclient.v1 import shell
 from tests import utils
 
@@ -963,20 +961,3 @@ class UrlParameterTest(testtools.TestCase):
         qs_dict = parse.parse_qs(parts.query)
         self.assertTrue('is_public' in qs_dict)
         self.assertTrue(qs_dict['is_public'][0].lower() == "true")
-
-    def test_copy_from_used(self):
-        class LegacyFakeArg(object):
-            def __init__(self, fields):
-                self.fields = fields
-                self.dry_run = False
-                self.verbose = False
-
-        def images_create(**kwargs):
-            class FakeImage():
-                id = "ThisiSanID"
-            self.assertNotEqual(kwargs['data'], sys.stdin)
-            return FakeImage()
-
-        self.gc.images.create = images_create
-        args = LegacyFakeArg(["copy_from=http://somehost.com/notreal.qcow"])
-        legacy_shell.do_add(self.gc, args)
diff --git a/tests/v1/test_legacy_shell.py b/tests/v1/test_legacy_shell.py
deleted file mode 100644
index 2ccb748..0000000
--- a/tests/v1/test_legacy_shell.py
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-# Copyright (C) 2013 Yahoo! Inc.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import mock
-import testtools
-
-from glanceclient import client
-from glanceclient import exc
-from glanceclient.v1 import legacy_shell as test_shell
-
-
-class LegacyShellV1Test(testtools.TestCase):
-    def test_print_image_formatted(self):
-
-        class FakeClient():
-            class FakeHTTPClient():
-                endpoint = 'http://is.invalid'
-            http_client = FakeHTTPClient()
-
-        class FakeImage():
-            id = 1
-            name = 'fake_image'
-            is_public = False
-            protected = False
-            status = 'active'
-            size = '1024'
-            min_ram = 512
-            min_disk = 10
-            properties = {'a': 'b', 'c': 'd'}
-            created_at = '04.03.2013'
-            owner = 'test'
-            updated_at = '04.03.2013'
-            deleted_at = '04.03.2013'
-
-        test_shell.print_image_formatted(FakeClient(), FakeImage())
-
-    def test_print_image(self):
-        class FakeImage():
-            id = 1
-            name = 'fake_image'
-            is_public = False
-            protected = False
-            status = 'active'
-            size = '1024'
-            min_ram = 512
-            min_disk = 10
-            properties = {'a': 'b', 'c': 'd'}
-            created_at = '04.03.2013'
-            owner = 'test'
-            updated_at = '04.03.2013'
-            deleted_at = '04.03.2013'
-
-        gc = client.Client('1', 'http://is.invalid:8080')
-        test_shell.print_image_formatted(gc, FakeImage())
-
-    def test_get_image_fields_from_args(self):
-        args = ["field=name"]
-        actual = test_shell.get_image_fields_from_args(args)
-        self.assertEqual({'field': 'name'}, actual)
-
-    def test_get_image_fields_from_args_exception_raises(self):
-        args = {"filed": "name"}
-        self.assertRaises(
-            RuntimeError, test_shell.get_image_fields_from_args, args)
-
-    def test_get_filters_from_args(self):
-        args = ["filter=name"]
-        actual = test_shell.get_image_filters_from_args(args)
-        self.assertEqual({'property-filter': 'name'}, actual)
-
-    def test_get_image_filters_from_args_exception_raises(self):
-        args = {"filter": "name"}
-        actual = test_shell.get_image_filters_from_args(args)
-        self.assertEqual(1, actual)
-
-    def test_do_add_error(self):
-        class FakeClient():
-            endpoint = 'http://is.invalid'
-
-        class args:
-            fields = 'name'
-
-        actual = test_shell.do_add(FakeClient(), args)
-        self.assertEqual(1, actual)
-
-    def test_do_add(self):
-        gc = client.Client('1', 'http://is.invalid')
-
-        class FakeImage():
-            fields = ['name=test',
-                      'status=active',
-                      'id=test',
-                      'is_public=True',
-                      'protected=False',
-                      'min_disk=10',
-                      'container_format=ovi',
-                      'status=active']
-            dry_run = True
-
-        test_args = FakeImage()
-        actual = test_shell.do_add(gc, test_args)
-        self.assertEqual(0, actual)
-
-    def test_do_add_with_image_meta(self):
-        gc = client.Client('1', 'http://is.invalid')
-
-        class FakeImage():
-            fields = ['name=test',
-                      'status=active',
-                      'is_public=True',
-                      'id=test',
-                      'protected=False',
-                      'min_disk=10',
-                      'container_format=ovi',
-                      'status=active',
-                      'size=256',
-                      'location=test',
-                      'checksum=1024',
-                      'owner=test_user']
-            dry_run = True
-
-        test_args = FakeImage()
-        actual = test_shell.do_add(gc, test_args)
-        self.assertEqual(0, actual)
-
-    def test_do_add_without_dry_run(self):
-        gc = client.Client('1', 'http://is.invalid')
-
-        class FakeImage():
-            fields = ['name=test',
-                      'status=active',
-                      'is_public=True',
-                      'id=test',
-                      'protected=False',
-                      'min_disk=10',
-                      'container_format=ovi',
-                      'status=active',
-                      'size=256',
-                      'location=test',
-                      'checksum=1024',
-                      'owner=test_user']
-            dry_run = False
-            id = 'test'
-            verbose = False
-
-        test_args = FakeImage()
-        with mock.patch.object(gc.images, 'create') as mocked_create:
-            mocked_create.return_value = FakeImage()
-            actual = test_shell.do_add(gc, test_args)
-            self.assertEqual(0, actual)
-
-    def test_do_clear_force_true_error(self):
-        class FakeImage1():
-            id = 1
-            name = 'fake_image'
-            is_public = False
-            protected = False
-            status = 'active'
-            size = '1024'
-            min_ram = 512
-            min_disk = 10
-            properties = {'a': 'b', 'c': 'd'}
-            created_at = '04.03.2013'
-            owner = 'test'
-            updated_at = '04.03.2013'
-            deleted_at = '04.03.2013'
-            force = True
-            verbose = True
-
-        class FakeImages():
-            def __init__(self):
-                self.id = 'test'
-                self.name = 'test_image_name'
-
-            def list(self):
-                self.list = [FakeImage1(), FakeImage1()]
-                return self.list
-
-        class FakeClient():
-            def __init__(self):
-                self.images = FakeImages()
-
-        test_args = FakeImage1()
-        actual = test_shell.do_clear(FakeClient(), test_args)
-        self.assertEqual(1, actual)
-
-    def test_do_clear_force_true(self):
-        class FakeImage1():
-            def __init__(self):
-                self.id = 1
-                self.name = 'fake_image'
-                self.is_public = False
-                self.protected = False
-                self.status = 'active'
-                self.size = '1024'
-                self.min_ram = 512
-                self.min_disk = 10
-                self.properties = {'a': 'b', 'c': 'd'}
-                self.created_at = '04.03.2013'
-                self.owner = 'test'
-                self.updated_at = '04.03.2013'
-                self.deleted_at = '04.03.2013'
-                self.force = True
-                self.verbose = True
-
-            def delete(self):
-                pass
-
-        class FakeImages():
-            def __init__(self):
-                self.id = 'test'
-                self.name = 'test_image_name'
-
-            def list(self):
-                self.list = [FakeImage1(), FakeImage1()]
-                return self.list
-
-        class FakeClient():
-            def __init__(self):
-                self.images = FakeImages()
-
-        test_args = FakeImage1()
-        actual = test_shell.do_clear(FakeClient(), test_args)
-        self.assertEqual(0, actual)
-
-    def test_do_update_error(self):
-        class FakeClient():
-            endpoint = 'http://is.invalid'
-
-        class Image():
-            fields = ['id', 'is_public', 'name']
-
-        args = Image()
-        fake_client = FakeClient()
-        actual = test_shell.do_update(fake_client, args)
-        self.assertEqual(1, actual)
-
-    def test_do_update_invalid_endpoint(self):
-        class Image():
-            fields = ['id=test_updated', 'is_public=True', 'name=new_name']
-            dry_run = False
-            id = 'test'
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        self.assertRaises(
-            exc.CommunicationError, test_shell.do_update, gc, args)
-
-    def test_do_update(self):
-        class Image():
-            fields = ['id=test_updated',
-                      'status=active',
-                      'is_public=True',
-                      'name=new_name',
-                      'protected=False']
-            dry_run = True
-            id = 'test'
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        actual = test_shell.do_update(gc, args)
-        self.assertEqual(0, actual)
-
-    def test_do_update_dry_run_false(self):
-        class Image():
-            fields = ['id=test_updated',
-                      'status=active',
-                      'is_public=True',
-                      'name=new_name',
-                      'protected=False',
-                      'is_public=True']
-            dry_run = False
-            id = 'test'
-            verbose = True
-            is_public = True
-            protected = False
-            status = 'active'
-            size = 1024
-            min_ram = 512
-            min_disk = 512
-            properties = {'property': 'test'}
-            created_at = '12.09.2013'
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(gc.images, 'update') as mocked_update:
-            mocked_update.return_value = Image()
-            actual = test_shell.do_update(gc, args)
-            self.assertEqual(0, actual)
-
-    def test_do_delete(self):
-        class FakeImage1():
-            def __init__(self):
-                self.id = 1
-                self.name = 'fake_image'
-                self.is_public = False
-                self.protected = False
-                self.status = 'active'
-                self.size = '1024'
-                self.min_ram = 512
-                self.min_disk = 10
-                self.properties = {'a': 'b', 'c': 'd'}
-                self.created_at = '04.03.2013'
-                self.owner = 'test'
-                self.updated_at = '04.03.2013'
-                self.deleted_at = '04.03.2013'
-                self.force = True
-                self.verbose = True
-
-            def delete(self):
-                pass
-
-            def get(self, id):
-                return FakeImage1()
-
-        class FakeClient():
-            def __init__(self):
-                self.images = FakeImage1()
-
-        test_shell.do_delete(FakeClient(), FakeImage1())
-
-    def test_show(self):
-        class Image():
-            fields = ['id=test_updated',
-                      'status=active',
-                      'is_public=True',
-                      'name=new_name',
-                      'protected=False']
-            id = 'test_show'
-            name = 'fake_image'
-            is_public = False
-            protected = False
-            status = 'active'
-            size = '1024'
-            min_ram = 512
-            min_disk = 10
-            properties = {'a': 'b', 'c': 'd'}
-            created_at = '04.03.2013'
-            owner = 'test'
-            updated_at = '04.03.2013'
-
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(gc.images, 'get') as mocked_get:
-            mocked_get.return_value = Image()
-            actual = test_shell.do_show(gc, Image())
-            self.assertEqual(0, actual)
-
-    def test_index(self):
-        class Image():
-            id = 'test'
-            filters = {}
-            limit = 18
-            marker = False
-            sort_key = 'test'
-            kwarg = 'name'
-            sort_dir = 'test'
-            name = 'test'
-            disk_format = 'ovi'
-            container_format = 'ovi'
-            size = 1024
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(gc.images, 'list') as mocked_list:
-            mocked_list.return_value = [Image(), Image()]
-            test_shell.do_index(gc, args)
-
-    def test_index_return_empty(self):
-        class Image():
-            id = 'test'
-            filters = {}
-            limit = 18
-            marker = False
-            sort_key = 'test'
-            kwarg = 'name'
-            sort_dir = 'test'
-            name = 'test'
-            disk_format = 'ovi'
-            container_format = 'ovi'
-            size = 1024
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(test_shell, '_get_images') as mocked_get:
-            mocked_get.return_value = False
-            actual = test_shell.do_index(gc, args)
-            self.assertEqual(0, actual)
-
-    def test_do_details(self):
-        class Image():
-            id = 'test'
-            filters = {}
-            limit = 18
-            marker = False
-            sort_key = 'test'
-            kwarg = 'name'
-            sort_dir = 'test'
-            name = 'test'
-            disk_format = 'ovi'
-            container_format = 'ovi'
-            size = 1024
-            is_public = True
-            protected = False
-            status = 'active'
-            min_ram = 512
-            min_disk = 512
-            properties = {}
-            created_at = '12.12.12'
-
-        args = Image()
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(gc.images, 'list') as mocked_list:
-            mocked_list.return_value = [Image(), Image()]
-            test_shell.do_details(gc, args)
-
-    def test_do_image_members(self):
-        class FakeImage1():
-            def __init__(self):
-                self.image_id = 1
-                self.name = 'fake_image'
-                self.is_public = False
-                self.protected = False
-                self.status = 'active'
-                self.size = '1024'
-                self.min_ram = 512
-                self.min_disk = 10
-                self.properties = {'a': 'b', 'c': 'd'}
-                self.created_at = '04.03.2013'
-                self.owner = 'test'
-                self.updated_at = '04.03.2013'
-                self.deleted_at = '04.03.2013'
-                self.force = True
-                self.verbose = True
-
-            def delete(self):
-                pass
-
-            def get(self, id):
-                return FakeImage1()
-
-        class FakeClient():
-            def __init__(self):
-                self.image_members = ImageMembers()
-
-        class ImageMembers():
-            def __init__(self):
-                self.member_id = 'test'
-                self.can_share = True
-
-            def list(self, image):
-                return [ImageMembers(), ImageMembers()]
-
-        test_shell.do_image_members(FakeClient(), FakeImage1())
-
-    def test_do_member_add_error(self):
-        class FakeClient():
-            def __init__(self):
-                self.image_members = ImageMembers()
-
-        class FakeImage1():
-            def __init__(self):
-                self.member_id = 'test'
-                self.fields = ["name", "id", "filter"]
-                self.dry_run = True
-                self.image_id = 'fake_image_id'
-                self.can_share = True
-
-            def delete(self):
-                pass
-
-            def get(self, id):
-                return FakeImage1()
-
-        class ImageMembers():
-            def __init__(self):
-                self.member_id = 'test'
-                self.can_share = True
-
-            def list(self, image):
-                return [ImageMembers(), ImageMembers()]
-
-        test_shell.do_member_add(FakeClient(), FakeImage1())
-
-    def test_do_member_images_empty_result(self):
-        class FakeImage1():
-            def __init__(self):
-                self.member_id = 'test'
-
-        gc = client.Client('1', 'http://is.invalid')
-        with mock.patch.object(gc.image_members, 'list') as mocked_list:
-            mocked_list.return_value = []
-            actual = test_shell.do_member_images(gc, FakeImage1())
-            self.assertEqual(0, actual)
-
-    def test_do_member_replace(self):
-        class FakeClient():
-            def __init__(self):
-                self.image_members = ImageMembers()
-
-        class ImageMembers():
-            def __init__(self):
-                self.member_id = 'test'
-                self.can_share = True
-                self.dry_run = True
-                self.image_id = "fake_image_id"
-
-            def list(self, image):
-                return [ImageMembers(), ImageMembers()]
-
-        test_shell.do_member_add(FakeClient(), ImageMembers())
-
-    def test_do_members_replace_dry_run_true(self):
-        class Fake():
-            def __init__(self):
-                self.dry_run = True
-                self.can_share = True
-                self.image_id = 'fake_id'
-                self.member_id = 'test'
-
-        gc = client.Client('1', 'http://is.invalid')
-        test_shell.do_members_replace(gc, Fake())
-
-    def test_do_members_replace_dry_run_false(self):
-        class Fake():
-            def __init__(self):
-                self.dry_run = False
-                self.can_share = True
-                self.image_id = 'fake_id'
-                self.member_id = 'test'
-
-        gc = client.Client('1', 'http://is.invalid')
-
-        with mock.patch.object(gc.image_members, 'list') as mocked_list:
-            mocked_list.return_value = []
-            with mock.patch.object(gc.image_members, 'create'):
-                test_shell.do_members_replace(gc, Fake())
-
-    def test_do_member_images(self):
-        class FakeClient():
-            def __init__(self):
-                self.image_members = ImageMembers()
-
-        class ImageMembers():
-            def __init__(self):
-                self.member_id = 'test'
-                self.can_share = True
-                self.dry_run = True
-                self.image_id = "fake_image_id"
-
-            def list(self, member):
-                return [ImageMembers(), ImageMembers()]
-
-        test_shell.do_member_images(FakeClient(), ImageMembers())
-
-    def test_create_pretty_table(self):
-        class MyPrettyTable(test_shell.PrettyTable):
-            def __init__(self):
-                self.columns = []
-
-        # Test add column
-        my_pretty_table = MyPrettyTable()
-        my_pretty_table.add_column(1, label='test')
-
-        # Test make header
-        test_res = my_pretty_table.make_header()
-        self.assertEqual('t\n-', test_res)
-
-        # Test make row
-        result = my_pretty_table.make_row('t')
-        self.assertEqual("t", result)
-        result = my_pretty_table._clip_and_justify(
-            data='test', width=4, just=1)
-        self.assertEqual("test", result)
diff --git a/tests/v1/test_shell.py b/tests/v1/test_shell.py
index 71ee11b..6624f9e 100644
--- a/tests/v1/test_shell.py
+++ b/tests/v1/test_shell.py
@@ -226,20 +226,6 @@ class ShellInvalidEndpointandParameterTest(utils.TestCase):
         self.assertRaises(
             exc.CommunicationError, self.run_command, 'image-list')
 
-    def test_image_details_invalid_endpoint_legacy(self):
-        self.assertRaises(
-            exc.CommunicationError, self.run_command, 'details')
-
-    def test_image_update_invalid_endpoint_legacy(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command, 'update {"name":""test}')
-
-    def test_image_index_invalid_endpoint_legacy(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command, 'index')
-
     def test_image_create_invalid_endpoint(self):
         self.assertRaises(
             exc.CommunicationError,
@@ -255,35 +241,16 @@ class ShellInvalidEndpointandParameterTest(utils.TestCase):
             exc.CommunicationError,
             self.run_command, 'image-download <fake>')
 
-    def test_image_members_invalid_endpoint(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command, 'image-members fake_id')
-
     def test_members_list_invalid_endpoint(self):
         self.assertRaises(
             exc.CommunicationError,
             self.run_command, 'member-list --image-id fake')
 
-    def test_member_replace_invalid_endpoint(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command, 'members-replace image_id member_id')
-
-    def test_image_show_invalid_endpoint_legacy(self):
-        self.assertRaises(
-            exc.CommunicationError, self.run_command, 'show image')
-
     def test_image_show_invalid_endpoint(self):
         self.assertRaises(
             exc.CommunicationError,
             self.run_command, 'image-show --human-readable <IMAGE_ID>')
 
-    def test_member_images_invalid_endpoint_legacy(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command, 'member-images member_id')
-
     def test_member_create_invalid_endpoint(self):
         self.assertRaises(
             exc.CommunicationError,
@@ -296,12 +263,6 @@ class ShellInvalidEndpointandParameterTest(utils.TestCase):
             self.run_command,
             'member-delete  <IMAGE_ID> <TENANT_ID>')
 
-    def test_member_add_invalid_endpoint(self):
-        self.assertRaises(
-            exc.CommunicationError,
-            self.run_command,
-            'member-add  <IMAGE_ID> <TENANT_ID>')
-
     def test_image_create_invalid_size_parameter(self):
         self.assertRaises(
             SystemExit,