Revision 2bd23362 kamaki/cli/commands/cyclades.py

b/kamaki/cli/commands/cyclades.py
59 59
    \n* to set authentication token: /config set cloud.<cloud>.token <token>'
60 60

  
61 61
howto_personality = [
62
    'Defines a file to be injected to VMs file system.',
62
    'Defines a file to be injected to virtual servers file system.',
63 63
    'syntax:  PATH,[SERVER_PATH,[OWNER,[GROUP,[MODE]]]]',
64 64
    '  PATH: local file to be injected (relative or absolute)',
65 65
    '  SERVER_PATH: destination location inside server Image',
66
    '  OWNER: VMs user id of the remote destination file',
67
    '  GROUP: VMs group id or name of the destination file',
66
    '  OWNER: virtual servers user id of the remote destination file',
67
    '  GROUP: virtual servers group id or name of the destination file',
68 68
    '  MODEL: permition in octal (e.g. 0777 or o+rwx)']
69 69

  
70 70

  
......
146 146
        since=DateArgument(
147 147
            'show only items since date (\' d/m/Y H:M:S \')',
148 148
            '--since'),
149
        limit=IntArgument('limit number of listed VMs', ('-n', '--number')),
149
        limit=IntArgument(
150
            'limit number of listed virtual servers', ('-n', '--number')),
150 151
        more=FlagArgument(
151 152
            'output results in pages (-n to set items per page, default 10)',
152 153
            '--more'),
......
346 347

  
347 348
@command(server_cmds)
348 349
class server_rename(_init_cyclades, _optional_output_cmd):
349
    """Set/update a server (VM) name
350
    VM names are not unique, therefore multiple servers may share the same name
350
    """Set/update a virtual server name
351
    virtual server names are not unique, therefore multiple servers may share
352
    the same name
351 353
    """
352 354

  
353 355
    @errors.generic.all
......
364 366

  
365 367
@command(server_cmds)
366 368
class server_delete(_init_cyclades, _optional_output_cmd, _server_wait):
367
    """Delete a server (VM)"""
369
    """Delete a virtual server"""
368 370

  
369 371
    arguments = dict(
370 372
        wait=FlagArgument('Wait server to be destroyed', ('-w', '--wait'))
......
392 394

  
393 395
@command(server_cmds)
394 396
class server_reboot(_init_cyclades, _optional_output_cmd, _server_wait):
395
    """Reboot a server (VM)"""
397
    """Reboot a virtual server"""
396 398

  
397 399
    arguments = dict(
398 400
        hard=FlagArgument(
......
434 436

  
435 437
@command(server_cmds)
436 438
class server_start(_init_cyclades, _optional_output_cmd, _server_wait):
437
    """Start an existing server (VM)"""
439
    """Start an existing virtual server"""
438 440

  
439 441
    arguments = dict(
440 442
        wait=FlagArgument('Wait server to be destroyed', ('-w', '--wait'))
......
464 466

  
465 467
@command(server_cmds)
466 468
class server_shutdown(_init_cyclades, _optional_output_cmd, _server_wait):
467
    """Shutdown an active server (VM)"""
469
    """Shutdown an active virtual server"""
468 470

  
469 471
    arguments = dict(
470 472
        wait=FlagArgument('Wait server to be destroyed', ('-w', '--wait'))
......
494 496

  
495 497
@command(server_cmds)
496 498
class server_console(_init_cyclades, _optional_json):
497
    """Get a VNC console to access an existing server (VM)
499
    """Get a VNC console to access an existing virtual server
498 500
    Console connection information provided (at least):
499 501
    - host: (url or address) a VNC host
500
    - port: (int) the gateway to enter VM on host
502
    - port: (int) the gateway to enter virtual server on host
501 503
    - password: for VNC authorization
502 504
    """
503 505

  
......
535 537

  
536 538
@command(server_cmds)
537 539
class server_firewall(_init_cyclades):
538
    """Manage server (VM) firewall profiles for public networks"""
540
    """Manage virtual server firewall profiles for public networks"""
539 541

  
540 542

  
541 543
@command(server_cmds)
542 544
class server_firewall_set(_init_cyclades, _optional_output_cmd):
543
    """Set the server (VM) firewall profile on VMs public network
545
    """Set the firewall profile on virtual server public network
544 546
    Values for profile:
545 547
    - DISABLED: Shutdown firewall
546 548
    - ENABLED: Firewall in normal mode
......
562 564

  
563 565
@command(server_cmds)
564 566
class server_firewall_get(_init_cyclades):
565
    """Get the server (VM) firewall profile for its public network"""
567
    """Get the firewall profile for a virtual servers' public network"""
566 568

  
567 569
    @errors.generic.all
568 570
    @errors.cyclades.connection
......
577 579

  
578 580
@command(server_cmds)
579 581
class server_addr(_init_cyclades, _optional_json):
580
    """List the addresses of all network interfaces on a server (VM)"""
582
    """List the addresses of all network interfaces on a virtual server"""
581 583

  
582 584
    arguments = dict(
583 585
        enum=FlagArgument('Enumerate results', '--enumerate')
......
620 622

  
621 623
@command(server_cmds)
622 624
class server_metadata_set(_init_cyclades, _optional_json):
623
    """Set / update server(VM) metadata
625
    """Set / update virtual server metadata
624 626
    Metadata should be given in key/value pairs in key=value format
625 627
    For example: /server metadata set <server id> key1=value1 key2=value2
626 628
    Old, unreferenced metadata will remain intact
......
655 657

  
656 658
@command(server_cmds)
657 659
class server_metadata_delete(_init_cyclades, _optional_output_cmd):
658
    """Delete server (VM) metadata"""
660
    """Delete virtual server metadata"""
659 661

  
660 662
    @errors.generic.all
661 663
    @errors.cyclades.connection
......
672 674

  
673 675
@command(server_cmds)
674 676
class server_stats(_init_cyclades, _optional_json):
675
    """Get server (VM) statistics"""
677
    """Get virtual server statistics"""
676 678

  
677 679
    @errors.generic.all
678 680
    @errors.cyclades.connection

Also available in: Unified diff