Merge pull request #806 from kyubifire/master

Fix block ordering issues on SLCLI, removed Snapshot and ISCSI commands from SLCLI

Author: allmightyspiff

SoftLayer/CLI/block/order.py

@@ -17,7 +17,8 @@
               required=True)
 @click.option('--size',
               type=int,
-              help='Size of block storage volume in GB',
+              help='Size of block storage volume in GB. Permitted Sizes:\n'
+                   '20, 40, 80, 100, 250, 500, 1000, 2000, 4000, 8000, 12000',
               required=True)
 @click.option('--iops',
               type=int,
@@ -71,7 +72,7 @@ def cli(env, storage_type, size, iops, tier, os_type,
         if snapshot_size is not None:
             raise exceptions.CLIAbort(
                 'Option --snapshot-size not allowed for performance volumes.'
-                ' Snapshots are only available for endurance storage.'
+                'Snapshots are only available for endurance storage.'
             )
 
         try:

SoftLayer/CLI/iscsi/__init__.py

@@ -118,12 +118,6 @@
     ('image:import', 'SoftLayer.CLI.image.import:cli'),
     ('image:export', 'SoftLayer.CLI.image.export:cli'),
 
-    ('iscsi', 'SoftLayer.CLI.iscsi'),
-    ('iscsi:cancel', 'SoftLayer.CLI.iscsi.cancel:cli'),
-    ('iscsi:create', 'SoftLayer.CLI.iscsi.create:cli'),
-    ('iscsi:detail', 'SoftLayer.CLI.iscsi.detail:cli'),
-    ('iscsi:list', 'SoftLayer.CLI.iscsi.list:cli'),
-
     ('loadbal', 'SoftLayer.CLI.loadbal'),
     ('loadbal:cancel', 'SoftLayer.CLI.loadbal.cancel:cli'),
     ('loadbal:create', 'SoftLayer.CLI.loadbal.create:cli'),
@@ -193,13 +187,6 @@
     ('hardware:credentials', 'SoftLayer.CLI.hardware.credentials:cli'),
     ('hardware:update-firmware', 'SoftLayer.CLI.hardware.update_firmware:cli'),
 
-    ('snapshot', 'SoftLayer.CLI.snapshot'),
-    ('snapshot:cancel', 'SoftLayer.CLI.snapshot.cancel:cli'),
-    ('snapshot:create', 'SoftLayer.CLI.snapshot.create:cli'),
-    ('snapshot:create-space', 'SoftLayer.CLI.snapshot.create_space:cli'),
-    ('snapshot:list', 'SoftLayer.CLI.snapshot.list:cli'),
-    ('snapshot:restore-volume', 'SoftLayer.CLI.snapshot.restore_volume:cli'),
-
     ('sshkey', 'SoftLayer.CLI.sshkey'),
     ('sshkey:add', 'SoftLayer.CLI.sshkey.add:cli'),
     ('sshkey:remove', 'SoftLayer.CLI.sshkey.remove:cli'),