Merge pull request #748 from kyubifire/file-and-block-commands

Add File commands and new Block commands

Author: underscorephil

SoftLayer/CLI/block/access/authorize.py

@@ -1,4 +1,4 @@
-"""Create a block storage snapshot."""
+"""Authorizes hosts on a specific block volume."""
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -40,3 +40,6 @@ def cli(env, volume_id, hardware_id, virtual_id, ip_address_id, ip_address):
                                            hardware_id,
                                            virtual_id,
                                            ip_address_id_list)
+
+    # If no exception was raised, the command succeeded
+    click.echo('The specified hosts were authorized to access %s' % volume_id)

SoftLayer/CLI/block/access/list.py

@@ -0,0 +1,38 @@
+"""List hosts with access to block volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import columns as column_helper
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer.CLI import storage_utils
+
+
+@click.command()
+@click.argument('volume_id')
+@click.option('--sortby', help='Column to sort by', default='name')
+@click.option('--columns',
+              callback=column_helper.get_formatter(storage_utils.COLUMNS),
+              help='Columns to display. Options: {0}'.format(
+                  ', '.join(column.name for column in storage_utils.COLUMNS)),
+              default=','.join(storage_utils.DEFAULT_COLUMNS))
+@environment.pass_env
+def cli(env, columns, sortby, volume_id):
+    """List ACLs."""
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+    access_list = block_manager.get_block_volume_access_list(
+        volume_id=volume_id)
+    table = formatting.Table(columns.columns)
+    table.sortby = sortby
+
+    for key, type_name in [('allowedVirtualGuests', 'VIRTUAL'),
+                           ('allowedHardware', 'HARDWARE'),
+                           ('allowedSubnets', 'SUBNET'),
+                           ('allowedIpAddresses', 'IP')]:
+        for obj in access_list.get(key, []):
+            obj['type'] = type_name
+            table.add_row([value or formatting.blank()
+                           for value in columns.row(obj)])
+
+    env.fout(table)

SoftLayer/CLI/block/access/revoke.py

@@ -1,4 +1,4 @@
-"""Create a block storage snapshot."""
+"""Revokes hosts' access on a specific block volume."""
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -14,7 +14,7 @@
 @click.option('--virtual-id', '-v', multiple=True,
               help='The id of one SoftLayer_Virtual_Guest'
               ' to revoke authorization')
-@click.option('--ip_address-id', '-i', multiple=True,
+@click.option('--ip-address-id', '-i', multiple=True,
               help='The id of one SoftLayer_Network_Subnet_IpAddress'
               ' to revoke authorization')
 @click.option('--ip-address', multiple=True,
@@ -36,3 +36,6 @@ def cli(env, volume_id, hardware_id, virtual_id, ip_address_id, ip_address):
                                              hardware_id,
                                              virtual_id,
                                              ip_address_id_list)
+
+    # If no exception was raised, the command succeeded
+    click.echo('Access to %s was revoked for the specified hosts' % volume_id)

SoftLayer/CLI/block/cancel.py

@@ -25,4 +25,15 @@ def cli(env, volume_id, reason, immediate):
     if not (env.skip_confirmations or formatting.no_going_back(volume_id)):
         raise exceptions.CLIAbort('Aborted')
 
-    block_storage_manager.cancel_block_volume(volume_id, reason, immediate)
+    cancelled = block_storage_manager.cancel_block_volume(volume_id,
+                                                          reason, immediate)
+
+    if cancelled:
+        if immediate:
+            click.echo('Block volume with id %s has been marked'
+                       ' for immediate cancellation' % volume_id)
+        else:
+            click.echo('Block volume with id %s has been marked'
+                       ' for cancellation' % volume_id)
+    else:
+        click.echo('Unable to cancel block volume %s' % volume_id)

SoftLayer/CLI/block/detail.py

@@ -51,9 +51,19 @@ def cli(env, volume_id):
             'Snapshot Capacity (GB)',
             block_volume['snapshotCapacityGb'],
         ])
-        table.add_row([
-            'Snapshot Used (Bytes)',
-            block_volume['parentVolume']['snapshotSizeBytes'],
-        ])
+        if 'snapshotSizeBytes' in block_volume['parentVolume']:
+            table.add_row([
+                'Snapshot Used (Bytes)',
+                block_volume['parentVolume']['snapshotSizeBytes'],
+            ])
+
+    table.add_row(['# of Active Transactions', "%i"
+                   % block_volume['activeTransactionCount']])
+
+    if block_volume['activeTransactions']:
+        for trans in block_volume['activeTransactions']:
+            table.add_row([
+                'Ongoing Transactions',
+                trans['transactionStatus']['friendlyName']])
 
     env.fout(table)

SoftLayer/CLI/block/list.py

@@ -16,12 +16,18 @@
                          mask="serviceResource.datacenter.name"),
     column_helper.Column(
         'storage_type',
-        lambda b: b['storageType']['keyName'].split('_').pop(0),
+        lambda b: b['storageType']['keyName'].split('_').pop(0)
+        if 'storageType' in b and 'keyName' in b['storageType']
+        and isinstance(b['storageType']['keyName'], str)
+        else '-',
         mask="storageType.keyName"),
     column_helper.Column('capacity_gb', ('capacityGb',), mask="capacityGb"),
     column_helper.Column('bytes_used', ('bytesUsed',), mask="bytesUsed"),
     column_helper.Column('ip_addr', ('serviceResourceBackendIpAddress',),
                          mask="serviceResourceBackendIpAddress"),
+    column_helper.Column('lunId', ('lunId',), mask="lunId"),
+    column_helper.Column('active_transactions', ('activeTransactionCount',),
+                         mask="activeTransactionCount"),
 ]
 
 DEFAULT_COLUMNS = [
@@ -31,7 +37,9 @@
     'storage_type',
     'capacity_gb',
     'bytes_used',
-    'ip_addr'
+    'ip_addr',
+    'lunId',
+    'active_transactions'
 ]
 
 

SoftLayer/CLI/block/order.py

@@ -12,12 +12,12 @@
 
 @click.command(context_settings=CONTEXT_SETTINGS)
 @click.option('--storage-type',
-              help='Type of storage volume',
+              help='Type of block storage volume',
               type=click.Choice(['performance', 'endurance']),
               required=True)
 @click.option('--size',
               type=int,
-              help='Size of storage volume in GB',
+              help='Size of block storage volume in GB',
               required=True)
 @click.option('--iops',
               type=int,

SoftLayer/CLI/block/snapshot/__init__.py

@@ -0,0 +1 @@
+"""Block Storage Snapshot Control."""

SoftLayer/CLI/block/snapshot/cancel.py

@@ -0,0 +1,40 @@
+"""Cancel a snapshot space subscription."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+
+@click.command()
+@click.argument('volume-id')
+@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")
+@environment.pass_env
+def cli(env, volume_id, reason, immediate):
+    """Cancel existing snapshot space for a given volume."""
+
+    block_storage_manager = SoftLayer.BlockStorageManager(env.client)
+
+    if not (env.skip_confirmations or formatting.no_going_back(volume_id)):
+        raise exceptions.CLIAbort('Aborted')
+
+    cancelled = block_storage_manager.cancel_snapshot_space(
+        volume_id, reason, immediate)
+
+    if cancelled:
+        if immediate:
+            click.echo('Block volume with id %s has been marked'
+                       ' for immediate snapshot cancellation' % volume_id)
+        else:
+            click.echo('Block volume with id %s has been marked'
+                       ' for snapshot cancellation' % volume_id)
+    else:
+        click.echo('Unable to cancel snapshot space for block volume %s'
+                   % volume_id)

SoftLayer/CLI/block/snapshot/create.py

@@ -0,0 +1,20 @@
+"""Create a block storage snapshot."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('volume_id')
+@click.option('--notes', '-n',
+              help='Notes to set on the new snapshot')
+@environment.pass_env
+def cli(env, volume_id, notes):
+    """Creates a snapshot on a given volume"""
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+    snapshot = block_manager.create_snapshot(volume_id, notes=notes)
+
+    if snapshot['id']:
+        click.echo('New snapshot created with id: %s' % snapshot['id'])