Enable slcli file and block storage commands to order tier 10 endurance storage and replica (#782)

* Changes to File volume list and detail commands to display NFS MountPoint for Volumes

* Enable slcli file and block storage commands to order tier 10 endurance storage and replica

Author: skraghu

SoftLayer/CLI/block/order.py

@@ -27,7 +27,7 @@
 @click.option('--tier',
               help='Endurance Storage Tier (IOP per GB)'
               '  [required for storage-type endurance]',
-              type=click.Choice(['0.25', '2', '4']))
+              type=click.Choice(['0.25', '2', '4', '10']))
 @click.option('--os-type',
               help='Operating System',
               type=click.Choice([
@@ -88,7 +88,9 @@ def cli(env, storage_type, size, iops, tier, os_type,
     if storage_type == 'endurance':
         if tier is None:
             raise exceptions.CLIAbort(
-                'Option --tier required with Endurance in IOPS/GB [0.25,2,4]')
+                'Option --tier required with Endurance in IOPS/GB '
+                '[0.25,2,4,10]'
+            )
 
         try:
             order = block_manager.order_block_volume(

SoftLayer/CLI/block/replication/order.py

@@ -24,7 +24,7 @@
 @click.option('--tier',
               help='Endurance Storage Tier (IOPS per GB) of the primary'
               ' volume for which a replicant is ordered [optional]',
-              type=click.Choice(['0.25', '2', '4']))
+              type=click.Choice(['0.25', '2', '4', '10']))
 @click.option('--os-type',
               help='Operating System Type (e.g.: LINUX) of the primary'
               ' volume for which a replica is ordered [optional]',

SoftLayer/CLI/file/order.py

@@ -27,7 +27,7 @@
 @click.option('--tier',
               help='Endurance Storage Tier (IOP per GB)'
               '  [required for storage-type endurance]',
-              type=click.Choice(['0.25', '2', '4']))
+              type=click.Choice(['0.25', '2', '4', '10']))
 @click.option('--os-type',
               help='Operating System',
               type=click.Choice([
@@ -88,7 +88,9 @@ def cli(env, storage_type, size, iops, tier, os_type,
     if storage_type == 'endurance':
         if tier is None:
             raise exceptions.CLIAbort(
-                'Option --tier required with Endurance in IOPS/GB [0.25,2,4]')
+                'Option --tier required with Endurance in IOPS/GB '
+                '[0.25,2,4,10]'
+            )
 
         try:
             order = file_manager.order_file_volume(

SoftLayer/CLI/file/replication/order.py

@@ -24,7 +24,7 @@
 @click.option('--tier',
               help='Endurance Storage Tier (IOPS per GB) of the primary'
               ' volume for which a replicant is ordered [optional]',
-              type=click.Choice(['0.25', '2', '4']))
+              type=click.Choice(['0.25', '2', '4', '10']))
 @environment.pass_env
 def cli(env, volume_id, snapshot_schedule, location, tier):
     """Order a file storage replica volume."""

SoftLayer/managers/storage_utils.py

@@ -13,6 +13,7 @@
     0.25: 100,
     2: 200,
     4: 300,
+    10: 1000,
 }
 
 
@@ -202,6 +203,9 @@ def find_endurance_tier_iops_per_gb(volume):
         if iops_per_gb == '4':
             return 4.0
 
+        if iops_per_gb == '10':
+            return 10.0
+
     raise ValueError("Could not find tier IOPS per GB for this volume")