From a0fdc07df71c519d13a36ea0e72f2b69775d04f7 Mon Sep 17 00:00:00 2001 From: Christopher Gallo Date: Wed, 20 Dec 2017 14:49:03 -0600 Subject: [PATCH 1/3] fixed block/file iops in the slcli block|file detail view --- SoftLayer/CLI/block/detail.py | 4 ++-- SoftLayer/CLI/file/detail.py | 4 ++-- SoftLayer/managers/block.py | 5 ++--- SoftLayer/managers/file.py | 2 +- tests/managers/block_tests.py | 2 +- tests/managers/file_tests.py | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/SoftLayer/CLI/block/detail.py b/SoftLayer/CLI/block/detail.py index ecfd5c4d5..87c53a8d9 100644 --- a/SoftLayer/CLI/block/detail.py +++ b/SoftLayer/CLI/block/detail.py @@ -28,8 +28,8 @@ def cli(env, volume_id): table.add_row(['Capacity (GB)', "%iGB" % block_volume['capacityGb']]) table.add_row(['LUN Id', "%s" % block_volume['lunId']]) - if block_volume.get('iops'): - table.add_row(['IOPs', block_volume['iops']]) + if block_volume.get('provisionedIops'): + table.add_row(['IOPs', int(block_volume['provisionedIops'])]) if block_volume.get('storageTierLevel'): table.add_row([ diff --git a/SoftLayer/CLI/file/detail.py b/SoftLayer/CLI/file/detail.py index cb712dc97..e34c1d419 100644 --- a/SoftLayer/CLI/file/detail.py +++ b/SoftLayer/CLI/file/detail.py @@ -38,8 +38,8 @@ def cli(env, volume_id): else: table.add_row(['Used Space', "%dGB" % (used_space / (1 << 30))]) - if file_volume.get('iops'): - table.add_row(['IOPs', file_volume['iops']]) + if file_volume.get('provisionedIops'): + table.add_row(['IOPs', int(file_volume['provisionedIops'])]) if file_volume.get('storageTierLevel'): table.add_row([ diff --git a/SoftLayer/managers/block.py b/SoftLayer/managers/block.py index 2b68ba13c..6d8f0e1b9 100644 --- a/SoftLayer/managers/block.py +++ b/SoftLayer/managers/block.py @@ -90,7 +90,7 @@ def get_block_volume_details(self, volume_id, **kwargs): 'serviceResource.datacenter[name]', 'serviceResourceBackendIpAddress', 'storageTierLevel', - 'iops', + 'provisionedIops', 'lunId', 'originalVolumeName', 'originalSnapshotName', @@ -105,8 +105,7 @@ def get_block_volume_details(self, volume_id, **kwargs): 'replicationSchedule[type[keyname]]]', ] kwargs['mask'] = ','.join(items) - return self.client.call('Network_Storage', 'getObject', - id=volume_id, **kwargs) + return self.client.call('Network_Storage', 'getObject', id=volume_id, **kwargs) def get_block_volume_access_list(self, volume_id, **kwargs): """Returns a list of authorized hosts for a specified volume. diff --git a/SoftLayer/managers/file.py b/SoftLayer/managers/file.py index 7c271b2e4..e1135ebe4 100644 --- a/SoftLayer/managers/file.py +++ b/SoftLayer/managers/file.py @@ -87,7 +87,7 @@ def get_file_volume_details(self, volume_id, **kwargs): 'serviceResourceBackendIpAddress', 'fileNetworkMountAddress', 'storageTierLevel', - 'iops', + 'provisionedIops', 'lunId', 'originalVolumeName', 'originalSnapshotName', diff --git a/tests/managers/block_tests.py b/tests/managers/block_tests.py index 203c021be..6f2e5eb6f 100644 --- a/tests/managers/block_tests.py +++ b/tests/managers/block_tests.py @@ -56,7 +56,7 @@ def test_get_block_volume_details(self): 'serviceResource.datacenter[name],'\ 'serviceResourceBackendIpAddress,'\ 'storageTierLevel,'\ - 'iops,'\ + 'provisionedIops,'\ 'lunId,'\ 'originalVolumeName,'\ 'originalSnapshotName,'\ diff --git a/tests/managers/file_tests.py b/tests/managers/file_tests.py index 389682cdc..1cbcb47ca 100644 --- a/tests/managers/file_tests.py +++ b/tests/managers/file_tests.py @@ -130,7 +130,7 @@ def test_get_file_volume_details(self): 'serviceResourceBackendIpAddress,'\ 'fileNetworkMountAddress,'\ 'storageTierLevel,'\ - 'iops,'\ + 'provisionedIops,'\ 'lunId,'\ 'originalVolumeName,'\ 'originalSnapshotName,'\ From 4331a929515a7b45ff92f4341255d895e585aa03 Mon Sep 17 00:00:00 2001 From: Christopher Gallo Date: Wed, 20 Dec 2017 14:55:41 -0600 Subject: [PATCH 2/3] manager.hardware.place_order size can now be a presetID --- SoftLayer/managers/hardware.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py index f6fcf68fc..a0b0ec20c 100644 --- a/SoftLayer/managers/hardware.py +++ b/SoftLayer/managers/hardware.py @@ -748,15 +748,13 @@ def _get_location(package, location): if region['location']['location']['name'] == location: return region - raise SoftLayer.SoftLayerError("Could not find valid location for: '%s'" - % location) + raise SoftLayer.SoftLayerError("Could not find valid location for: '%s'" % location) def _get_preset_id(package, size): """Get the preset id given the keyName of the preset.""" for preset in package['activePresets']: - if preset['keyName'] == size: + if preset['keyName'] == size or preset['id'] == size: return preset['id'] - raise SoftLayer.SoftLayerError("Could not find valid size for: '%s'" - % size) + raise SoftLayer.SoftLayerError("Could not find valid size for: '%s'" % size) From 4ca7b92f4665621186a2462467ccff40268f1d4c Mon Sep 17 00:00:00 2001 From: Christopher Gallo Date: Wed, 20 Dec 2017 14:55:51 -0600 Subject: [PATCH 3/3] updated docs --- SoftLayer/managers/hardware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py index a0b0ec20c..97ef6cd67 100644 --- a/SoftLayer/managers/hardware.py +++ b/SoftLayer/managers/hardware.py @@ -298,7 +298,7 @@ def place_order(self, **kwargs): See get_create_options() for valid arguments. - :param string size: server size name + :param string size: server size name or presetId :param string hostname: server hostname :param string domain: server domain name :param string location: location (datacenter) name