← Back to branch summary

~corey.bryant/python-keystoneclient/1.6.0

« back to all changes in this revision

Viewing changes to keystoneclient/v2_0/shell.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-06-22 12:58:18 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20120622125818-yy6uzmhxu12q20cr
Tags: 2012.2~f2~20120621.121-0ubuntu
New upstream release. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystoneclient/v2_0/shell.py
26
26
def do_user_list(kc, args):
27
27
    """List users"""
28
28
    users = kc.users.list(tenant_id=args.tenant_id)
29
 
    utils.print_list(users, ['id', 'enabled', 'email', 'name'])
 
29
    utils.print_list(users, ['id', 'name', 'enabled', 'email'])
30
30
 
31
31
 
32
32
@utils.arg('id', metavar='<user-id>', help='User ID to display')
118
118
def do_tenant_create(kc, args):
119
119
    """Create new tenant"""
120
120
    tenant = kc.tenants.create(args.name,
121
 
                             description=args.description,
122
 
                             enabled=utils.string_to_bool(args.enabled))
 
121
                               description=args.description,
 
122
                               enabled=utils.string_to_bool(args.enabled))
123
123
    utils.print_dict(tenant._info)
124
124
 
125
125
 
157
157
           help='Name of new service (must be unique)')
158
158
@utils.arg('--type', metavar='<type>', required=True,
159
159
           help='Service type (one of: identity, compute, network, '
160
 
                 'image, or object-store)')
 
160
                'image, or object-store)')
161
161
@utils.arg('--description', metavar='<service-description>',
162
162
           help='Description of service')
163
163
def do_service_create(kc, args):
270
270
 
271
271
@utils.arg('--user_id', metavar='<user-id>', help='User ID')
272
272
@utils.arg('--access', metavar='<access-key>', required=True,
273
 
        help='Access Key')
 
273
           help='Access Key')
274
274
def do_ec2_credentials_get(kc, args):
275
275
    """Display EC2-compatibile credentials"""
276
276
    if not args.user_id:
300
300
 
301
301
@utils.arg('--user_id', metavar='<user-id>', help='User ID')
302
302
@utils.arg('--access', metavar='<access-key>', required=True,
303
 
        help='Access Key')
 
303
           help='Access Key')
304
304
def do_ec2_credentials_delete(kc, args):
305
305
    """Delete EC2-compatibile credentials"""
306
306
    if not args.user_id:
359
359
 
360
360
@utils.arg('--region', metavar='<endpoint-region>',
361
361
           help='Endpoint region', default='regionOne')
362
 
@utils.arg('--service_id', metavar='<service-id>',
 
362
@utils.arg('--service_id', metavar='<service-id>', required=True,
363
363
           help='ID of service associated with Endpoint')
364
364
@utils.arg('--publicurl', metavar='<public-url>',
365
365
           help='Public URL endpoint')
369
369
           help='Internal URL endpoint')
370
370
def do_endpoint_create(kc, args):
371
371
    """Create a new endpoint associated with a service"""
372
 
    endpoint = kc.endpoints.create(
373
 
                    args.region, args.service_id, args.publicurl,
374
 
                    args.adminurl, args.internalurl)
 
372
    endpoint = kc.endpoints.create(args.region,
 
373
                                   args.service_id,
 
374
                                   args.publicurl,
 
375
                                   args.adminurl,
 
376
                                   args.internalurl)
375
377
    utils.print_dict(endpoint._info)
376
378
 
377
379