Skip to content

Commit 76be081

Browse files
author
David Pickle
committed
Address additional PR feedback; fix bug in price lookup function
1 parent e3b3d24 commit 76be081

File tree

5 files changed

+65
-63
lines changed

5 files changed

+65
-63
lines changed

‎SoftLayer/fixtures/SoftLayer_Network_Storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SAAS_TEST_VOLUME = {
1+
STAAS_TEST_VOLUME = {
22
'accountId': 1234,
33
'activeTransactions': None,
44
'activeTransactionCount': 0,

‎SoftLayer/managers/storage_utils.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ def find_saas_endurance_space_price(package, size, tier_level):
278278
:param tier_level: The endurance tier for which a price is desired
279279
:return: Returns the price for the size and tier, or an error if not found
280280
"""
281+
if tier_level != 0.25:
282+
tier_level = int(tier_level)
281283
key_name = 'STORAGE_SPACE_FOR_{0}_IOPS_PER_GB'.format(tier_level)
282284
key_name = key_name.replace(".", "_")
283285
for item in package['items']:

‎tests/managers/block_tests.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def test_order_block_volume_performance(self):
277277
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
278278
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
279279

280-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
280+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
281281
prev_storage_type_keyname = mock_volume['storageType']['keyName']
282282
mock_volume['storageType']['keyName'] = 'PERFORMANCE_BLOCK_STORAGE'
283283
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -324,7 +324,7 @@ def test_order_block_volume_endurance(self):
324324
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
325325
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
326326

327-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
327+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
328328
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
329329
mock.return_value = mock_volume
330330

@@ -437,7 +437,7 @@ def test_order_block_snapshot_space_upgrade(self):
437437
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
438438
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
439439

440-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
440+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
441441
prev_storage_type_keyname = mock_volume['storageType']['keyName']
442442
mock_volume['storageType']['keyName'] = 'ENDURANCE_BLOCK_STORAGE'
443443
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -469,7 +469,7 @@ def test_order_block_snapshot_space(self):
469469
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
470470
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
471471

472-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
472+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
473473
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
474474
mock.return_value = mock_volume
475475

@@ -494,7 +494,7 @@ def test_order_block_snapshot_space(self):
494494
)
495495

496496
def test_order_block_replicant_os_type_not_found(self):
497-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
497+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
498498
prev_os_type = mock_volume['osType']
499499
del mock_volume['osType']
500500
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -521,7 +521,7 @@ def test_order_block_replicant_performance_os_type_given(self):
521521
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
522522
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
523523

524-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
524+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
525525
prev_storage_type_keyname = mock_volume['storageType']['keyName']
526526
mock_volume['storageType']['keyName'] = 'PERFORMANCE_BLOCK_STORAGE'
527527
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -570,7 +570,7 @@ def test_order_block_replicant_endurance(self):
570570
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
571571
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
572572

573-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
573+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
574574
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
575575
mock.return_value = mock_volume
576576

@@ -606,7 +606,7 @@ def test_order_block_duplicate_origin_os_type_not_found(self):
606606
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
607607
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
608608

609-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
609+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
610610
prev_os_type = mock_volume['osType']
611611
del mock_volume['osType']
612612
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -627,7 +627,7 @@ def test_order_block_duplicate_performance_no_duplicate_snapshot(self):
627627
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
628628
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
629629

630-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
630+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
631631
prev_storage_type_keyname = mock_volume['storageType']['keyName']
632632
mock_volume['storageType']['keyName'] = 'PERFORMANCE_BLOCK_STORAGE'
633633
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -666,7 +666,7 @@ def test_order_block_duplicate_performance(self):
666666
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
667667
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
668668

669-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
669+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
670670
prev_storage_type_keyname = mock_volume['storageType']['keyName']
671671
mock_volume['storageType']['keyName'] = 'PERFORMANCE_BLOCK_STORAGE'
672672
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -712,7 +712,7 @@ def test_order_block_duplicate_endurance_no_duplicate_snapshot(self):
712712
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
713713
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
714714

715-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
715+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
716716
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
717717
mock.return_value = mock_volume
718718

@@ -746,7 +746,7 @@ def test_order_block_duplicate_endurance(self):
746746
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
747747
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
748748

749-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
749+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
750750
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
751751
mock.return_value = mock_volume
752752

‎tests/managers/file_tests.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ def test_order_file_volume_performance(self):
354354
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
355355
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
356356

357-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
357+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
358358
prev_storage_type_keyname = mock_volume['storageType']['keyName']
359359
mock_volume['storageType']['keyName'] = 'PERFORMANCE_FILE_STORAGE'
360360
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -399,7 +399,7 @@ def test_order_file_volume_endurance(self):
399399
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
400400
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
401401

402-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
402+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
403403
prev_storage_type_keyname = mock_volume['storageType']['keyName']
404404
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
405405
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -440,7 +440,7 @@ def test_order_file_snapshot_space_upgrade(self):
440440
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
441441
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
442442

443-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
443+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
444444
prev_storage_type_keyname = mock_volume['storageType']['keyName']
445445
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
446446
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -472,7 +472,7 @@ def test_order_file_snapshot_space(self):
472472
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
473473
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
474474

475-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
475+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
476476
prev_storage_type_keyname = mock_volume['storageType']['keyName']
477477
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
478478
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -507,7 +507,7 @@ def test_order_file_replicant_performance(self):
507507
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
508508
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
509509

510-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
510+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
511511
prev_storage_type_keyname = mock_volume['storageType']['keyName']
512512
mock_volume['storageType']['keyName'] = 'PERFORMANCE_FILE_STORAGE'
513513
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -550,7 +550,7 @@ def test_order_file_replicant_endurance(self):
550550
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
551551
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
552552

553-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
553+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
554554
prev_storage_type_keyname = mock_volume['storageType']['keyName']
555555
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
556556
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -589,7 +589,7 @@ def test_order_file_duplicate_performance_no_duplicate_snapshot(self):
589589
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
590590
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
591591

592-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
592+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
593593
prev_storage_type_keyname = mock_volume['storageType']['keyName']
594594
mock_volume['storageType']['keyName'] = 'PERFORMANCE_FILE_STORAGE'
595595
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -627,7 +627,7 @@ def test_order_file_duplicate_performance(self):
627627
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
628628
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
629629

630-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
630+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
631631
prev_storage_type_keyname = mock_volume['storageType']['keyName']
632632
mock_volume['storageType']['keyName'] = 'PERFORMANCE_FILE_STORAGE'
633633
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -672,7 +672,7 @@ def test_order_file_duplicate_endurance_no_duplicate_snapshot(self):
672672
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
673673
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
674674

675-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
675+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
676676
prev_storage_type_keyname = mock_volume['storageType']['keyName']
677677
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
678678
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
@@ -709,7 +709,7 @@ def test_order_file_duplicate_endurance(self):
709709
mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
710710
mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
711711

712-
mock_volume = fixtures.SoftLayer_Network_Storage.SAAS_TEST_VOLUME
712+
mock_volume = fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME
713713
prev_storage_type_keyname = mock_volume['storageType']['keyName']
714714
mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
715715
mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')

0 commit comments

Comments
 (0)