Skip to content

Commit 77dc936

Browse files
tox and style fixes
1 parent 63219ac commit 77dc936

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

SoftLayer/managers/block.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,4 @@ def _get_ids_from_username(self, username):
190190
results = self.list_block_volumes(username=username, mask=object_mask)
191191
if results:
192192
return [result['id'] for result in results]
193-
193+
return []

SoftLayer/managers/file.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,4 @@ def _get_ids_from_username(self, username):
163163
results = self.list_file_volumes(username=username, mask=object_mask)
164164
if results:
165165
return [result['id'] for result in results]
166-
166+
return []

SoftLayer/managers/storage.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ def __init__(self, client):
2525
self.client = client
2626
self.resolvers = [self._get_ids_from_username]
2727

28-
def _get_ids_from_username(self, username):
29-
raise exceptions.SoftLayerError("Not Implemented.")
30-
3128
def get_volume_count_limits(self):
3229
"""Returns a list of block volume count limit.
3330

tests/CLI/modules/block_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ def test_volume_detail_name_identifier(self):
107107
'type': {
108108
'type': {'operation': '!~ ISCSI'}
109109
}
110-
},
110+
},
111111
'storageType': {
112112
'keyName': {'operation': '*= BLOCK_STORAGE'}
113-
},
113+
},
114114
'username': {'operation': '_= SL-12345'}}}
115115

116116
self.assert_called_with('SoftLayer_Account', 'getIscsiNetworkStorage', filter=expected_filter)

tests/CLI/modules/file_tests.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,16 @@ def test_volume_detail_name_identifier(self):
171171
'type': {
172172
'type': {'operation': '!~ NAS'}
173173
}
174-
},
174+
},
175175
'storageType': {
176176
'keyName': {'operation': '*= FILE_STORAGE'}
177-
},
177+
},
178178
'username': {'operation': '_= SL-12345'}}}
179179

180180
self.assert_called_with('SoftLayer_Account', 'getNasNetworkStorage', filter=expected_filter)
181181
self.assert_called_with('SoftLayer_Network_Storage', 'getObject', identifier=1)
182182
self.assert_no_fail(result)
183183

184-
185184
def test_volume_order_performance_iops_not_given(self):
186185
result = self.run_command(['file', 'volume-order',
187186
'--storage-type=performance', '--size=20',

0 commit comments

Comments
 (0)