Merge pull request #1840 from edsonarios/issue1839

`slcli block access`, updated some descriptions, change flag -h to -d, sort flags

Author: allmightyspiff

SoftLayer/CLI/autoscale/detail.py

@@ -15,7 +15,7 @@
 @click.argument('identifier')
 @environment.pass_env
 def cli(env, identifier):
-    """Get details of an Autoscale groups."""
+    """Get details of an Autoscale group."""
 
     autoscale = AutoScaleManager(env.client)
     group = autoscale.details(identifier)

SoftLayer/CLI/autoscale/list.py

@@ -13,7 +13,7 @@
 @click.command(cls=SLCommand)
 @environment.pass_env
 def cli(env):
-    """List AutoScale Groups."""
+    """List all Autoscale Groups on your account."""
 
     autoscale = AutoScaleManager(env.client)
     groups = autoscale.list()

SoftLayer/CLI/block/access/authorize.py

@@ -11,17 +11,17 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
-@click.option('--hardware-id', '-h', multiple=True,
-              help='The id of one SoftLayer_Hardware to authorize ' + MULTIPLE)
-@click.option('--virtual-id', '-v', multiple=True,
-              help='The id of one SoftLayer_Virtual_Guest to authorize ' + MULTIPLE)
+@click.option('--hardware-id', '-d', multiple=True,
+              help='The ID of one hardware server to authorize. ' + MULTIPLE)
 @click.option('--ip-address-id', '-i', multiple=True,
-              help='The id of one SoftLayer_Network_Subnet_IpAddress to authorize ' + MULTIPLE)
+              help='The ID of one SoftLayer_Network_Subnet_IpAddress to authorize. ' + MULTIPLE)
 @click.option('--ip-address', multiple=True,
-              help='An IP address to authorize ' + MULTIPLE)
+              help='An IP address to authorize. ' + MULTIPLE)
+@click.option('--virtual-id', '-v', multiple=True,
+              help='The ID of one virtual server to authorize. ' + MULTIPLE)
 @environment.pass_env
 def cli(env, volume_id, hardware_id, virtual_id, ip_address_id, ip_address):
-    """Authorizes hosts to access a given volume"""
+    """Authorize hosts to access a given volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     ip_address_id_list = list(ip_address_id)
 

SoftLayer/CLI/block/access/list.py

@@ -12,15 +12,18 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @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(
+              help='Columns to display. Options are: {0}.'.format(
                   ', '.join(column.name for column in storage_utils.COLUMNS)),
               default=','.join(storage_utils.DEFAULT_COLUMNS))
+@click.option('--sortby',
+              help='Column to sort by. Options are: {0}.'.format(
+                  ', '.join(column.name for column in storage_utils.COLUMNS)),
+              default='name')
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):
-    """List ACLs."""
+    """List hosts that are authorized to access the volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     resolved_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Volume Id')
     access_list = block_manager.get_block_volume_access_list(

SoftLayer/CLI/block/access/password.py

@@ -9,7 +9,7 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('access_id')
 @click.option('--password', '-p', multiple=False,
-              help='Password you want to set, this command will fail if the password is not strong')
+              help='Password you want to set, this command will fail if the password is not strong.')
 @environment.pass_env
 def cli(env, access_id, password):
     """Changes a password for a volume's access.

SoftLayer/CLI/block/access/revoke.py

@@ -8,20 +8,17 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
-@click.option('--hardware-id', '-h', multiple=True,
-              help='The id of one SoftLayer_Hardware'
-              ' to revoke authorization')
-@click.option('--virtual-id', '-v', multiple=True,
-              help='The id of one SoftLayer_Virtual_Guest'
-              ' to revoke authorization')
+@click.option('--hardware-id', '-d', multiple=True,
+              help='The ID of one SoftLayer_Hardware to revoke authorization.')
 @click.option('--ip-address-id', '-i', multiple=True,
-              help='The id of one SoftLayer_Network_Subnet_IpAddress'
-              ' to revoke authorization')
+              help='The ID of one SoftLayer_Network_Subnet_IpAddress to revoke authorization.')
 @click.option('--ip-address', multiple=True,
-              help='An IP address to revoke authorization')
+              help='An IP address to revoke authorization.')
+@click.option('--virtual-id', '-v', multiple=True,
+              help='The ID of one SoftLayer_Virtual_Guest to revoke authorization.')
 @environment.pass_env
 def cli(env, volume_id, hardware_id, virtual_id, ip_address_id, ip_address):
-    """Revokes authorization for hosts accessing a given volume"""
+    """Revoke authorization for hosts that are accessing a specific volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     ip_address_id_list = list(ip_address_id)