Skip to content

Commit 6e4e568

Browse files
caberoscaberos
authored andcommitted
fix the team code review comments and fix the unit test
1 parent 6937a46 commit 6e4e568

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

SoftLayer/managers/network.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,10 @@ def list_vlans(self, datacenter=None, vlan_number=None, name=None, limit=100, **
542542
kwargs['mask'] = DEFAULT_VLAN_MASK
543543

544544
kwargs['iter'] = True
545-
return self.account.getNetworkVlans(mask=kwargs['mask'], filter=_filter.to_dict(), limit=limit)
545+
if limit > 0:
546+
return self.account.getNetworkVlans(mask=kwargs['mask'], filter=_filter.to_dict(), limit=limit)
547+
else:
548+
return self.account.getNetworkVlans(mask=kwargs['mask'], filter=_filter.to_dict(), iter=True)
546549

547550
def list_securitygroups(self, **kwargs):
548551
"""List security groups."""

tests/managers/network_tests.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,14 @@ def test_list_vlans_with_filters(self):
360360
self.assertEqual(result, fixtures.SoftLayer_Account.getNetworkVlans)
361361
_filter = {
362362
'networkVlans': {
363-
'primaryRouter': {
364-
'datacenter': {
365-
'name': {'operation': '_= dal00'}},
366-
},
363+
'id': {
364+
'operation': 'orderBy',
365+
'options': [
366+
{'name': 'sort', 'value': ['ASC']}]},
367367
'vlanNumber': {'operation': 5},
368368
'name': {'operation': '_= primary-vlan'},
369-
},
369+
'primaryRouter': {
370+
'datacenter': {'name': {'operation': '_= dal00'}}}}
370371
}
371372
self.assert_called_with('SoftLayer_Account', 'getNetworkVlans',
372373
filter=_filter)

0 commit comments

Comments
 (0)