diff --git a/SoftLayer/CLI/block/order.py b/SoftLayer/CLI/block/order.py index 22430e429..4aaf03067 100644 --- a/SoftLayer/CLI/block/order.py +++ b/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( diff --git a/SoftLayer/CLI/block/replication/order.py b/SoftLayer/CLI/block/replication/order.py index c25a8beb6..5aebea17e 100644 --- a/SoftLayer/CLI/block/replication/order.py +++ b/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]', diff --git a/SoftLayer/CLI/file/order.py b/SoftLayer/CLI/file/order.py index 0219efdbe..7f4acfc97 100644 --- a/SoftLayer/CLI/file/order.py +++ b/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( diff --git a/SoftLayer/CLI/file/replication/order.py b/SoftLayer/CLI/file/replication/order.py index 7c4617fa0..4b3231e66 100644 --- a/SoftLayer/CLI/file/replication/order.py +++ b/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.""" diff --git a/SoftLayer/managers/storage_utils.py b/SoftLayer/managers/storage_utils.py index 0ee01ef95..3fe47af6b 100644 --- a/SoftLayer/managers/storage_utils.py +++ b/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")