From 0de1e9e663197410a93c4fdaee00ec48cfe09bb6 Mon Sep 17 00:00:00 2001
From: Leno Hou <houqy@linux.vnet.ibm.com>
Date: Fri, 4 Aug 2017 13:50:11 +0800
Subject: [PATCH] block/volume-detail: add iops details for endurance storage

v1 -> v2:
  1. use provisionedIops instead of properties.
  2. updated mask accordingly.

Signed-off-by: Leno Hou <houqy@linux.vnet.ibm.com>
---
 SoftLayer/CLI/block/detail.py |  4 ++--
 SoftLayer/managers/block.py   |  2 +-
 tests/managers/block_tests.py | 27 +--------------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/SoftLayer/CLI/block/detail.py b/SoftLayer/CLI/block/detail.py
index b8ba8bed5..4afafe12c 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', block_volume['provisionedIops']])
 
     if block_volume.get('storageTierLevel'):
         table.add_row([
diff --git a/SoftLayer/managers/block.py b/SoftLayer/managers/block.py
index 37e73d6f4..62c5e7aed 100644
--- a/SoftLayer/managers/block.py
+++ b/SoftLayer/managers/block.py
@@ -89,7 +89,7 @@ def get_block_volume_details(self, volume_id, **kwargs):
                 'serviceResource.datacenter[name]',
                 'serviceResourceBackendIpAddress',
                 'storageTierLevel',
-                'iops',
+                'provisionedIops',
                 'lunId',
                 'originalVolumeName',
                 'originalSnapshotName',
diff --git a/tests/managers/block_tests.py b/tests/managers/block_tests.py
index d58db5d16..cb522c49f 100644
--- a/tests/managers/block_tests.py
+++ b/tests/managers/block_tests.py
@@ -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):