Merge pull request #1599 from caberos/issue1598

Add an orderBy filter to slcli vlan list

Author: allmightyspiff

SoftLayer/managers/network.py

@@ -506,7 +506,7 @@ def list_subnets(self, identifier=None, datacenter=None, version=0,
         kwargs['iter'] = True
         return self.client.call('Account', 'getSubnets', **kwargs)
 
-    def list_vlans(self, datacenter=None, vlan_number=None, name=None, **kwargs):
+    def list_vlans(self, datacenter=None, vlan_number=None, name=None, limit=100, **kwargs):
         """Display a list of all VLANs on the account.
 
         This provides a quick overview of all VLANs including information about
@@ -523,6 +523,8 @@ def list_vlans(self, datacenter=None, vlan_number=None, name=None, **kwargs):
         """
         _filter = utils.NestedDict(kwargs.get('filter') or {})
 
+        _filter['networkVlans']['id'] = utils.query_filter_orderby()
+
         if vlan_number:
             _filter['networkVlans']['vlanNumber'] = (
                 utils.query_filter(vlan_number))
@@ -540,7 +542,10 @@ def list_vlans(self, datacenter=None, vlan_number=None, name=None, **kwargs):
             kwargs['mask'] = DEFAULT_VLAN_MASK
 
         kwargs['iter'] = True
-        return self.account.getNetworkVlans(**kwargs)
+        if limit > 0:
+            return self.account.getNetworkVlans(mask=kwargs['mask'], filter=_filter.to_dict(), limit=limit)
+        else:
+            return self.account.getNetworkVlans(mask=kwargs['mask'], filter=_filter.to_dict(), iter=True)
 
     def list_securitygroups(self, **kwargs):
         """List security groups."""

tests/managers/network_tests.py

@@ -360,13 +360,14 @@ def test_list_vlans_with_filters(self):
         self.assertEqual(result, fixtures.SoftLayer_Account.getNetworkVlans)
         _filter = {
             'networkVlans': {
-                'primaryRouter': {
-                    'datacenter': {
-                        'name': {'operation': '_= dal00'}},
-                },
+                'id': {
+                    'operation': 'orderBy',
+                    'options': [
+                           {'name': 'sort', 'value': ['ASC']}]},
                 'vlanNumber': {'operation': 5},
                 'name': {'operation': '_= primary-vlan'},
-            },
+                'primaryRouter': {
+                      'datacenter': {'name': {'operation': '_= dal00'}}}}
         }
         self.assert_called_with('SoftLayer_Account', 'getNetworkVlans',
                                 filter=_filter)