diff options
Diffstat (limited to 'openstackclient/object')
| -rw-r--r-- | openstackclient/object/client.py | 7 | ||||
| -rw-r--r-- | openstackclient/object/v1/account.py | 15 | ||||
| -rw-r--r-- | openstackclient/object/v1/container.py | 68 | ||||
| -rw-r--r-- | openstackclient/object/v1/object.py | 72 |
4 files changed, 102 insertions, 60 deletions
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py index 865f18f6..9eb7ad7b 100644 --- a/openstackclient/object/client.py +++ b/openstackclient/object/client.py @@ -50,7 +50,8 @@ def build_option_parser(parser): '--os-object-api-version', metavar='<object-api-version>', default=utils.env('OS_OBJECT_API_VERSION'), - help='Object API version, default=' + - DEFAULT_API_VERSION + - ' (Env: OS_OBJECT_API_VERSION)') + help='Object API version, default=' + + DEFAULT_API_VERSION + + ' (Env: OS_OBJECT_API_VERSION)', + ) return parser diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py index d6bc9fd7..ef3a47f7 100644 --- a/openstackclient/object/v1/account.py +++ b/openstackclient/object/v1/account.py @@ -30,8 +30,10 @@ class SetAccount(command.Command): metavar="<key=value>", required=True, action=parseractions.KeyValueAction, - help=_("Set a property on this account " - "(repeat option to set multiple properties)") + help=_( + "Set a property on this account " + "(repeat option to set multiple properties)" + ), ) return parser @@ -48,7 +50,8 @@ class ShowAccount(command.ShowOne): data = self.app.client_manager.object_store.account_show() if 'properties' in data: data['properties'] = format_columns.DictColumn( - data.pop('properties')) + data.pop('properties') + ) return zip(*sorted(data.items())) @@ -63,8 +66,10 @@ class UnsetAccount(command.Command): required=True, action='append', default=[], - help=_('Property to remove from account ' - '(repeat option to remove multiple properties)'), + help=_( + 'Property to remove from account ' + '(repeat option to remove multiple properties)' + ), ) return parser diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py index 917e41c0..4f01c1d9 100644 --- a/openstackclient/object/v1/container.py +++ b/openstackclient/object/v1/container.py @@ -37,11 +37,11 @@ class CreateContainer(command.Lister): '--public', action='store_true', default=False, - help="Make the container publicly accessible" + help="Make the container publicly accessible", ) parser.add_argument( '--storage-policy', - help="Specify a particular storage policy to use." + help="Specify a particular storage policy to use.", ) parser.add_argument( 'containers', @@ -52,26 +52,33 @@ class CreateContainer(command.Lister): return parser def take_action(self, parsed_args): - results = [] for container in parsed_args.containers: if len(container) > 256: - LOG.warning( - _('Container name is %s characters long, the default limit' - ' is 256'), len(container)) + msg = _( + 'Container name is %d characters long, the default limit' + ' is 256' + ) + LOG.warning(msg, len(container)) data = self.app.client_manager.object_store.container_create( container=container, public=parsed_args.public, - storage_policy=parsed_args.storage_policy + storage_policy=parsed_args.storage_policy, ) results.append(data) columns = ("account", "container", "x-trans-id") - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={}, - ) for s in results)) + ) + for s in results + ), + ) class DeleteContainer(command.Command): @@ -80,7 +87,8 @@ class DeleteContainer(command.Command): def get_parser(self, prog_name): parser = super(DeleteContainer, self).get_parser(prog_name) parser.add_argument( - '--recursive', '-r', + '--recursive', + '-r', action='store_true', default=False, help=_('Recursively delete objects and container'), @@ -94,11 +102,11 @@ class DeleteContainer(command.Command): return parser def take_action(self, parsed_args): - for container in parsed_args.containers: if parsed_args.recursive: objs = self.app.client_manager.object_store.object_list( - container=container) + container=container + ) for obj in objs: self.app.client_manager.object_store.object_delete( container=container, @@ -150,7 +158,6 @@ class ListContainer(command.Lister): return parser def take_action(self, parsed_args): - if parsed_args.long: columns = ('Name', 'Bytes', 'Count') else: @@ -168,15 +175,19 @@ class ListContainer(command.Lister): if parsed_args.all: kwargs['full_listing'] = True - data = self.app.client_manager.object_store.container_list( - **kwargs - ) + data = self.app.client_manager.object_store.container_list(**kwargs) - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SaveContainer(command.Command): @@ -212,8 +223,10 @@ class SetContainer(command.Command): metavar="<key=value>", required=True, action=parseractions.KeyValueAction, - help=_("Set a property on this container " - "(repeat option to set multiple properties)") + help=_( + "Set a property on this container " + "(repeat option to set multiple properties)" + ), ) return parser @@ -237,7 +250,6 @@ class ShowContainer(command.ShowOne): return parser def take_action(self, parsed_args): - data = self.app.client_manager.object_store.container_show( container=parsed_args.container, ) @@ -263,8 +275,10 @@ class UnsetContainer(command.Command): required=True, action='append', default=[], - help=_('Property to remove from container ' - '(repeat option to remove multiple properties)'), + help=_( + 'Property to remove from container ' + '(repeat option to remove multiple properties)' + ), ) return parser diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py index 01e537ee..e88be162 100644 --- a/openstackclient/object/v1/object.py +++ b/openstackclient/object/v1/object.py @@ -48,23 +48,31 @@ class CreateObject(command.Lister): parser.add_argument( '--name', metavar='<name>', - help=_('Upload a file and rename it. ' - 'Can only be used when uploading a single object') + help=_( + 'Upload a file and rename it. ' + 'Can only be used when uploading a single object' + ), ) return parser def take_action(self, parsed_args): if parsed_args.name: if len(parsed_args.objects) > 1: - msg = _('Attempting to upload multiple objects and ' - 'using --name is not permitted') + msg = _( + 'Attempting to upload multiple objects and ' + 'using --name is not permitted' + ) raise exceptions.CommandError(msg) results = [] for obj in parsed_args.objects: if len(obj) > 1024: LOG.warning( - _('Object name is %s characters long, default limit' - ' is 1024'), len(obj)) + _( + 'Object name is %s characters long, default limit' + ' is 1024' + ), + len(obj), + ) data = self.app.client_manager.object_store.object_create( container=parsed_args.container, object=obj, @@ -73,11 +81,17 @@ class CreateObject(command.Lister): results.append(data) columns = ("object", "container", "etag") - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={}, - ) for s in results)) + ) + for s in results + ), + ) class DeleteObject(command.Command): @@ -99,7 +113,6 @@ class DeleteObject(command.Command): return parser def take_action(self, parsed_args): - for obj in parsed_args.objects: self.app.client_manager.object_store.object_delete( container=parsed_args.container, @@ -158,7 +171,6 @@ class ListObject(command.Lister): return parser def take_action(self, parsed_args): - if parsed_args.long: columns = ( 'Name', @@ -185,15 +197,20 @@ class ListObject(command.Lister): kwargs['full_listing'] = True data = self.app.client_manager.object_store.object_list( - container=parsed_args.container, - **kwargs + container=parsed_args.container, **kwargs ) - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SaveObject(command.Command): @@ -204,8 +221,10 @@ class SaveObject(command.Command): parser.add_argument( "--file", metavar="<filename>", - help=_("Destination filename (defaults to object name); using '-'" - " as the filename will print the file to stdout"), + help=_( + "Destination filename (defaults to object name); using '-'" + " as the filename will print the file to stdout" + ), ) parser.add_argument( 'container', @@ -247,8 +266,10 @@ class SetObject(command.Command): metavar="<key=value>", required=True, action=parseractions.KeyValueAction, - help=_("Set a property on this object " - "(repeat option to set multiple properties)") + help=_( + "Set a property on this object " + "(repeat option to set multiple properties)" + ), ) return parser @@ -278,7 +299,6 @@ class ShowObject(command.ShowOne): return parser def take_action(self, parsed_args): - data = self.app.client_manager.object_store.object_show( container=parsed_args.container, object=parsed_args.object, @@ -310,8 +330,10 @@ class UnsetObject(command.Command): required=True, action='append', default=[], - help=_('Property to remove from object ' - '(repeat option to remove multiple properties)'), + help=_( + 'Property to remove from object ' + '(repeat option to remove multiple properties)' + ), ) return parser |