Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SoftLayer/CLI/block/detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -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', block_volume['provisionedIops']])

if block_volume.get('storageTierLevel'):
table.add_row([
Expand Down
2 changes: 1 addition & 1 deletion SoftLayer/managers/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def get_block_volume_details(self, volume_id, **kwargs):
'serviceResource.datacenter[name]',
'serviceResourceBackendIpAddress',
'storageTierLevel',
'iops',
'provisionedIops',
'lunId',
'originalVolumeName',
'originalSnapshotName',
Expand Down
27 changes: 1 addition & 26 deletions tests/managers/block_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,10 @@ def test_get_block_volume_details(self):

self.assertEqual(fixtures.SoftLayer_Network_Storage.getObject, result)

expected_mask = 'id,'\
'username,'\
'password,'\
'capacityGb,'\
'snapshotCapacityGb,'\
'parentVolume.snapshotSizeBytes,'\
'storageType.keyName,'\
'serviceResource.datacenter[name],'\
'serviceResourceBackendIpAddress,'\
'storageTierLevel,'\
'iops,'\
'lunId,'\
'originalVolumeName,'\
'originalSnapshotName,'\
'originalVolumeSize,'\
'activeTransactionCount,'\
'activeTransactions.transactionStatus[friendlyName],'\
'replicationPartnerCount,'\
'replicationStatus,'\
'replicationPartners[id,username,'\
'serviceResourceBackendIpAddress,'\
'serviceResource[datacenter[name]],'\
'replicationSchedule[type[keyname]]]'

self.assert_called_with(
'SoftLayer_Network_Storage',
'getObject',
identifier=100,
mask='mask[%s]' % expected_mask
identifier=100
)

def test_list_block_volumes(self):
Expand Down