Merge pull request #115 from soulshake/diskattach

Diskattach position

gandi/cli/commands/disk.py

@@ -119,13 +119,18 @@ def detach(gandi, resource, background, force):
 @cli.command()
 @click.option('--bg', '--background', default=False, is_flag=True,
               help='Run command in background mode (default=False).')
+@click.option('-r', '--read-only', default=False, is_flag=True,
+        help='Attach disk as read-only')
+@click.option('--position', '-p', type=click.INT,
+        help='Position where disk should be attached: 0 for system disk. '
+             'If there is already a disk attached at the specified position, it will be swapped.')
 @click.option('--force', '-f', is_flag=True,
               help='This is a dangerous option that will cause CLI to continue'
                    ' without prompting. (default=False).')
 @pass_gandi
 @click.argument('disk', nargs=1, required=True)
 @click.argument('vm', nargs=1, required=True)
-def attach(gandi, disk, vm, background, force):
+def attach(gandi, disk, vm, position, read_only, background, force):
     """ Attach disk to vm.
 
     disk can be a disk name, or ID
@@ -146,7 +151,7 @@ def attach(gandi, disk, vm, background, force):
         if not proceed:
             return
 
-    result = gandi.disk.attach(disk, vm, background)
+    result = gandi.disk.attach(disk, vm, background, position, read_only)
     if background and result:
         gandi.pretty_echo(result)
 

gandi/cli/modules/disk.py

@@ -183,19 +183,27 @@ def delete(cls, resources, background=False):
         return opers
 
     @classmethod
-    def _attach(cls, disk_id, vm_id):
+    def _attach(cls, disk_id, vm_id, options=None):
         """ Attach a disk to a vm. """
-        oper = cls.call('hosting.vm.disk_attach', vm_id, disk_id)
+        options = options or {}
+        oper = cls.call('hosting.vm.disk_attach', vm_id, disk_id, options)
         return oper
 
     @classmethod
-    def attach(cls, disk, vm, background):
+    def attach(cls, disk, vm, background, position=None, read_only=False):
         from gandi.cli.modules.iaas import Iaas as VM
         vm_id = VM.usable_id(vm)
 
         disk_id = cls.usable_id(disk)
         disk_info = cls._info(disk_id)
 
+        options = {}
+        if position is not None:
+            options['position'] = position
+
+        if read_only:
+            options['access'] = 'read'
+
         need_detach = disk_info.get('vms_id')
         if need_detach:
             if disk_info.get('vms_id') == [vm_id]:
@@ -209,7 +217,7 @@ def attach(cls, disk, vm, background):
             cls.echo('Detaching your disk.')
             cls.display_progress(detach_op)
 
-        oper = cls._attach(disk_id, vm_id)
+        oper = cls._attach(disk_id, vm_id, options)
 
         if oper and not background:
             cls.echo('Attaching your disk(s).')

gandicli.man.rst

@@ -183,7 +183,7 @@ Details:
 
 * ``gandi disk update resource`` modify the options of a virtual disk. Possible options are ``--kernel KERNEL`` to setup or update disk kernel, ``--cmdline TEXT`` to change kernel cmdline, ``--name TEXT`` for the label of the virtual disk, ``--size SIZE[M|G|T]`` for the new size of the disk, ``--snapshotprofile TEXT`` to select a profile of snapshot to apply to the disk for keeping multiple version of data in a timeline. All these modification can be done as background process using the option ``--background`` (or ``--bg``).
 
-* ``gandi disk attach disk vm`` attach the given disk to the given vm, if the disk is currently attached, it will start by detaching it. Possible option is ``--force`` to skip all questions about detaching and attaching. All these modification can be done as background process using the option ``--background`` (or ``--bg``).
+* ``gandi disk attach disk vm`` attach the given disk to the given vm, if the disk is currently attached, it will start by detaching it. Possible options: ``--force`` to skip all questions about detaching and attaching; ``--position INTEGER`` (or ``-p``) to specify the position at which the disk should be attached (0 for system disk); ``--read-only`` (or ``-r``) to attach the disk in read-only mode. All these modification can be done as background process using the option ``--background`` (or ``--bg``).
 
 * ``gandi disk detach disk`` detach the disk from the vm it is currently attached. Possible option is ``--force`` to skip all questions about detaching. All these modification can be done as background process using the option ``--background`` (or ``--bg``).