tox fixes

Author: allmightyspiff

SoftLayer/API.py

@@ -6,14 +6,14 @@
     :license: MIT, see LICENSE for more details.
 """
 # pylint: disable=invalid-name
+import time
+import warnings
+
 import concurrent.futures as cf
 import json
 import logging
 import math
 import requests
-import time
-import warnings
-
 
 from SoftLayer import auth as slauth
 from SoftLayer import config
@@ -369,7 +369,6 @@ def cf_call(self, service, method, *args, **kwargs):
         # How many more API calls we have to make
         api_calls = math.ceil((first_call.total_count - limit) / limit)
 
-
         def this_api(offset):
             """Used to easily call executor.map() on this fuction"""
             return self.call(service, method, offset=offset, limit=limit, *args, **kwargs)
@@ -383,8 +382,6 @@ def this_api(offset):
             first_call = first_call + call_result
         return first_call
 
-
-
     def __repr__(self):
         return "Client(transport=%r, auth=%r)" % (self.transport, self.auth)
 

SoftLayer/managers/network.py

@@ -515,7 +515,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, limit=100, mask=None, _filter={}):
+    def list_vlans(self, datacenter=None, vlan_number=None, name=None, limit=100, mask=None, _filter=None):
         """Display a list of all VLANs on the account.
 
         This provides a quick overview of all VLANs including information about
@@ -527,25 +527,25 @@ def list_vlans(self, datacenter=None, vlan_number=None, name=None, limit=100, ma
         :param dict \\*\\*kwargs: response-level options (mask, limit, etc.)
 
         """
-        _filter = utils.NestedDict(_filter)
+        _filter = utils.NestedDict(_filter or {})
 
         _filter['networkVlans']['id'] = utils.query_filter_orderby()
 
         if vlan_number:
-            _filter['networkVlans']['vlanNumber'] = (utils.query_filter(vlan_number))
+            _filter['networkVlans']['vlanNumber'] = utils.query_filter(vlan_number)
 
         if name:
             _filter['networkVlans']['name'] = utils.query_filter(name)
 
         if datacenter:
-            _filter['networkVlans']['primaryRouter']['datacenter']['name'] = (utils.query_filter(datacenter))
+            _filter['networkVlans']['primaryRouter']['datacenter']['name'] = utils.query_filter(datacenter)
 
         if mask is None:
             mask = DEFAULT_VLAN_MASK
 
         # cf_call uses threads to get all results.
         return self.client.cf_call('SoftLayer_Account', 'getNetworkVlans',
-                                    mask=mask, filter=_filter.to_dict(), limit=limit)
+                                   mask=mask, filter=_filter.to_dict(), limit=limit)
 
     def list_securitygroups(self, **kwargs):
         """List security groups."""

tests/CLI/modules/vlan_tests.py

@@ -147,9 +147,15 @@ def test_vlan_list_get_pod_with_closed_announcement(self, ngb_mock):
         ngb_mock.return_value = True
         vlan_mock = self.set_mock('SoftLayer_Account', 'getNetworkVlans')
         gpods_mock = self.set_mock('SoftLayer_Network_Pod', 'getAllObjects')
-        vlan_mock.return_value = {'primaryRouter': {'fullyQualifiedDomainName': 'bcr01a.fra02.softlayer.com',
-                                                    'id': 462912},
-                                  'tagReferences': ''}
+        vlan_mock.return_value = [
+            {
+                "primaryRouter": {
+                    "fullyQualifiedDomainName": "bcr01a.fra02.softlayer.com",
+                    "id": 462912
+                },
+                "tagReferences": ""
+            }
+        ]
         gpods_mock.return_value = [{'backendRouterId': 462912,
                                     'backendRouterName': 'bcr01a.fra02',
                                     'datacenterId': 449506,
@@ -166,9 +172,15 @@ def test_vlan_list_get_pod_with_closed_announcement_no_closure(self, ngb_mock):
         ngb_mock.return_value = True
         vlan_mock = self.set_mock('SoftLayer_Account', 'getNetworkVlans')
         gpods_mock = self.set_mock('SoftLayer_Network_Pod', 'getAllObjects')
-        vlan_mock.return_value = {'primaryRouter': {'fullyQualifiedDomainName': 'bcr01a.fra02.softlayer.com',
-                                                    'id': 462912},
-                                  'tagReferences': ''}
+        vlan_mock.return_value = [
+            {
+                "primaryRouter": {
+                    "fullyQualifiedDomainName": "bcr01a.fra02.softlayer.com",
+                    "id": 462912
+                },
+                "tagReferences": ""
+            }
+        ]
         gpods_mock.return_value = [{'backendRouterId': 462912,
                                     'backendRouterName': 'bcr01a.fra02',
                                     'datacenterId': 449506,