Merge pull request #1858 from edsonarios/issue1856

Updated command slcli block snapshot-order, added flag iops

Author: allmightyspiff

SoftLayer/CLI/block/snapshot/cancel.py

@@ -11,11 +11,11 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume-id')
-@click.option('--reason', help="An optional reason for cancellation")
+@click.option('--reason', help="An optional reason for cancellation.")
 @click.option('--immediate',
               is_flag=True,
               help="Cancels the snapshot space immediately instead "
-                   "of on the billing anniversary")
+                   "of on the billing anniversary.")
 @environment.pass_env
 def cli(env, volume_id, reason, immediate):
     """Cancel existing snapshot space for a given volume."""

SoftLayer/CLI/block/snapshot/create.py

@@ -9,10 +9,10 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--notes', '-n',
-              help='Notes to set on the new snapshot')
+              help='Notes to set on the new snapshot.')
 @environment.pass_env
 def cli(env, volume_id, notes):
-    """Creates a snapshot on a given volume"""
+    """Creates a snapshot on a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     snapshot = block_manager.create_snapshot(volume_id, notes=notes)
 

SoftLayer/CLI/block/snapshot/delete.py

@@ -10,7 +10,7 @@
 @click.argument('snapshot_id')
 @environment.pass_env
 def cli(env, snapshot_id):
-    """Deletes a snapshot on a given volume"""
+    """Deletes a snapshot on a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     deleted = block_manager.delete_snapshot(snapshot_id)
 

SoftLayer/CLI/block/snapshot/disable.py

@@ -10,11 +10,11 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--schedule-type',
-              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY]',
+              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY].',
               required=True)
 @environment.pass_env
 def cli(env, volume_id, schedule_type):
-    """Disables snapshots on the specified schedule for a given volume"""
+    """Disables snapshots on the specified schedule for a given volume."""
 
     if (schedule_type not in ['INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY']):
         raise exceptions.CLIAbort(

SoftLayer/CLI/block/snapshot/enable.py

@@ -10,24 +10,24 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.option('--schedule-type',
-              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY]',
+              help='Snapshot schedule [INTERVAL|HOURLY|DAILY|WEEKLY].',
               required=True)
 @click.option('--retention-count',
-              help='Number of snapshots to retain',
+              help='Number of snapshots to retain.',
               required=True)
 @click.option('--minute',
-              help='Minute of the day when snapshots should be taken',
+              help='Minute of the day when snapshots should be taken.',
               default=0)
 @click.option('--hour',
-              help='Hour of the day when snapshots should be taken',
+              help='Hour of the day when snapshots should be taken.',
               default=0)
 @click.option('--day-of-week',
-              help='Day of the week when snapshots should be taken',
+              help='Day of the week when snapshots should be taken.',
               default='SUNDAY')
 @environment.pass_env
 def cli(env, volume_id, schedule_type, retention_count,
         minute, hour, day_of_week):
-    """Enables snapshots for a given volume on the specified schedule"""
+    """Enables snapshots for a given volume on the specified schedule."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
     valid_schedule_types = {'INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY'}

SoftLayer/CLI/block/snapshot/get_notify_status.py

@@ -10,7 +10,7 @@
 @click.argument('volume_id')
 @environment.pass_env
 def cli(env, volume_id):
-    """Get snapshots space usage threshold warning flag setting for a given volume"""
+    """Get snapshots space usage threshold warning flag setting for a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     enabled = block_manager.get_volume_snapshot_notification_status(volume_id)
 

SoftLayer/CLI/block/snapshot/list.py

@@ -28,7 +28,7 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
-@click.option('--sortby', help='Column to sort by',
+@click.option('--sortby', help='Column to sort by.',
               default='created')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),

SoftLayer/CLI/block/snapshot/order.py

@@ -9,34 +9,45 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
-@click.option('--capacity',
+@click.option('--iops',
               type=int,
-              help='Size of snapshot space to create in GB',
+              help='Performance Storage IOPs, between 100 and 6000 in multiples of 100.')
+@click.option('--size',
+              type=int,
+              help='Size of snapshot space to create in GB.',
               required=True)
 @click.option('--tier',
               help='Endurance Storage Tier (IOPS per GB) of the block'
               ' volume for which space is ordered [optional, and only'
-              ' valid for endurance storage volumes]',
+              ' valid for endurance storage volumes].',
               type=click.Choice(['0.25', '2', '4', '10']))
 @click.option('--upgrade',
               type=bool,
-              help='Flag to indicate that the order is an upgrade',
+              help='Flag to indicate that the order is an upgrade.',
               default=False,
               is_flag=True)
 @environment.pass_env
-def cli(env, volume_id, capacity, tier, upgrade):
+def cli(env, volume_id, size, tier, upgrade, iops):
     """Order snapshot space for a block storage volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
     if tier is not None:
         tier = float(tier)
 
+    if iops is not None:
+        if iops < 100 or iops > 6000:
+            raise exceptions.ArgumentError(f"Invalid value for '--iops' / '-i': '{iops}' is not one "
+                                           "of between 100 and 6000.")
+        if iops % 100 != 0:
+            raise exceptions.ArgumentError(f"Invalid value for '--iops' / '-i': '{iops}' is not a multiple of 100.")
+
     try:
         order = block_manager.order_snapshot_space(
             volume_id,
-            capacity=capacity,
+            capacity=size,
             tier=tier,
-            upgrade=upgrade
+            upgrade=upgrade,
+            iops=iops
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))

SoftLayer/CLI/block/snapshot/restore.py

@@ -10,10 +10,10 @@
 @click.argument('volume_id')
 @click.option('--snapshot-id', '-s',
               help='The id of the snapshot which will be used'
-              ' to restore the block volume')
+              ' to restore the block volume.')
 @environment.pass_env
 def cli(env, volume_id, snapshot_id):
-    """Restore block volume using a given snapshot"""
+    """Restore block volume using a given snapshot."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     success = block_manager.restore_from_snapshot(volume_id, snapshot_id)
 

SoftLayer/CLI/block/snapshot/schedule_list.py

@@ -11,7 +11,7 @@
 @click.argument('volume_id')
 @environment.pass_env
 def cli(env, volume_id):
-    """Lists snapshot schedules for a given volume"""
+    """Lists snapshot schedules for a given volume."""
 
     block_manager = SoftLayer.BlockStorageManager(env.client)