Revision 8741c407 kamaki/cli/commands/image_cli.py

b/kamaki/cli/commands/image_cli.py
41 41
from kamaki.cli.commands import _command_init, errors
42 42

  
43 43

  
44
image_cmds = CommandTree(
45
    'image',
46
    'Compute/Cyclades or Glance API image commands')
44
image_cmds = CommandTree('image', 'Plankton Image API commands')
47 45
_commands = [image_cmds]
48 46

  
49 47

  
......
174 172
        if not location.startswith('pithos://'):
175 173
            account = self.config.get('store', 'account') \
176 174
                or self.config.get('global', 'account')
175
            assert account, 'No user account provided'
177 176
            if account[-1] == '/':
178 177
                account = account[:-1]
179 178
            container = self.config.get('store', 'container') \
......
282 281

  
283 282

  
284 283
@command(image_cmds)
285
class image_list(_init_cyclades):
284
class image_compute(_init_cyclades):
285
    """Compute Image API commands"""
286

  
287

  
288
@command(image_cmds)
289
class image_compute_list(_init_cyclades):
286 290
    """List images"""
287 291

  
288 292
    arguments = dict(
......
315 319

  
316 320

  
317 321
@command(image_cmds)
318
class image_info(_init_cyclades):
322
class image_compute_info(_init_cyclades):
319 323
    """Get detailed information on an image"""
320 324

  
321 325
    @errors.generic.all
......
333 337

  
334 338

  
335 339
@command(image_cmds)
336
class image_delete(_init_cyclades):
340
class image_compute_delete(_init_cyclades):
337 341
    """Delete an image (WARNING: image file is also removed)"""
338 342

  
339 343
    @errors.generic.all
......
348 352

  
349 353

  
350 354
@command(image_cmds)
351
class image_properties(_init_cyclades):
355
class image_compute_properties(_init_cyclades):
352 356
    """Get properties related to OS installation in an image"""
353 357

  
354 358
    @errors.generic.all
......
382 386

  
383 387

  
384 388
@command(image_cmds)
385
class image_setproperty(_init_cyclades):
389
class image_compute_setproperty(_init_cyclades):
386 390
    """Update an existing property in an image"""
387 391

  
388 392
    @errors.generic.all
......
400 404

  
401 405

  
402 406
@command(image_cmds)
403
class image_delproperty(_init_cyclades):
407
class image_compute_delproperty(_init_cyclades):
404 408
    """Delete a property of an image"""
405 409

  
406 410
    @errors.generic.all

Also available in: Unified diff