1f8b814628
1) Change metadata to appear under a common 'properties' key, and use the utility to format them, this applied to object, account and container. 2) Clean up container and object output, which were setting the x-container-meta-owner property, but this is metadata only for the container, so it's pointless to have, removed it. 3) Container show was showing read/write ACLs and sync stuff, but these are not being returned by my swift by default, so I moved these to be checks, so we don't clutter the output. Change-Id: Ife7521fe9c2724035b06963c118bd6016ba2f5b5
86 lines
2.6 KiB
Python
86 lines
2.6 KiB
Python
# 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.
|
|
#
|
|
|
|
"""Account v1 action implementations"""
|
|
|
|
import logging
|
|
|
|
from cliff import command
|
|
from cliff import show
|
|
import six
|
|
|
|
from openstackclient.common import parseractions
|
|
from openstackclient.common import utils
|
|
|
|
|
|
class SetAccount(command.Command):
|
|
"""Set account properties"""
|
|
|
|
log = logging.getLogger(__name__ + '.SetAccount')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(SetAccount, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
"--property",
|
|
metavar="<key=value>",
|
|
required=True,
|
|
action=parseractions.KeyValueAction,
|
|
help="Set a property on this account "
|
|
"(repeat option to set multiple properties)"
|
|
)
|
|
return parser
|
|
|
|
@utils.log_method(log)
|
|
def take_action(self, parsed_args):
|
|
self.app.client_manager.object_store.account_set(
|
|
properties=parsed_args.property,
|
|
)
|
|
|
|
|
|
class ShowAccount(show.ShowOne):
|
|
"""Display account details"""
|
|
|
|
log = logging.getLogger(__name__ + '.ShowAccount')
|
|
|
|
@utils.log_method(log)
|
|
def take_action(self, parsed_args):
|
|
data = self.app.client_manager.object_store.account_show()
|
|
if 'properties' in data:
|
|
data['properties'] = utils.format_dict(data.pop('properties'))
|
|
return zip(*sorted(six.iteritems(data)))
|
|
|
|
|
|
class UnsetAccount(command.Command):
|
|
"""Unset account properties"""
|
|
|
|
log = logging.getLogger(__name__ + '.UnsetAccount')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(UnsetAccount, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--property',
|
|
metavar='<key>',
|
|
required=True,
|
|
action='append',
|
|
default=[],
|
|
help='Property to remove from account '
|
|
'(repeat option to remove multiple properties)',
|
|
)
|
|
return parser
|
|
|
|
@utils.log_method(log)
|
|
def take_action(self, parsed_args):
|
|
self.app.client_manager.object_store.account_unset(
|
|
properties=parsed_args.property,
|
|
)
|