fix tox tool

Author: caberos

SoftLayer/CLI/loadbal/order.py

@@ -135,7 +135,7 @@ def order_options(env, datacenter):
 
             # Vlan/Subnet Lookups
             mask = "mask[networkVlan,podName,addressSpace]"
-            subnets = net_mgr.list_subnets(datacenter=dc_name, network_space='PRIVATE', mask=mask)
+            subnets = net_mgr.list_subnets(mask=mask)
             subnet_table = formatting.Table(['Id', 'Subnet', 'Vlan'], title='Private subnet')
 
             for subnet in subnets:

SoftLayer/CLI/subnet/list.py

@@ -21,15 +21,8 @@
                                  'IPs',
                                  'hardware',
                                  'vs']))
-@click.option('--datacenter', '-d',
-              help="Filter by datacenter shortname (sng01, dal05, ...)")
-@click.option('--identifier', help="Filter by network identifier")
-@click.option('--subnet-type', '-t', help="Filter by subnet type")
-@click.option('--network-space', help="Filter by network space")
-@click.option('--ipv4', '--v4', is_flag=True, help="Display only IPv4 subnets")
-@click.option('--ipv6', '--v6', is_flag=True, help="Display only IPv6 subnets")
 @environment.pass_env
-def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, ipv6):
+def cli(env, sortby):
     """List subnets."""
 
     mgr = SoftLayer.NetworkManager(env.client)
@@ -40,19 +33,7 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
     ])
     table.sortby = sortby
 
-    version = 0
-    if ipv4:
-        version = 4
-    elif ipv6:
-        version = 6
-
-    subnets = mgr.list_subnets(
-        datacenter=datacenter,
-        version=version,
-        identifier=identifier,
-        subnet_type=subnet_type,
-        network_space=network_space,
-    )
+    subnets = mgr.list_subnets()
 
     for subnet in subnets:
         table.add_row([
@@ -62,7 +43,7 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
             utils.lookup(subnet,
                          'networkVlan',
                          'networkSpace') or formatting.blank(),
-            utils.lookup(subnet, 'datacenter', 'name',) or formatting.blank(),
+            utils.lookup(subnet, 'datacenter', 'name', ) or formatting.blank(),
             subnet['networkVlanId'],
             subnet['ipAddressCount'],
             len(subnet['hardware']),

SoftLayer/managers/network.py

@@ -470,23 +470,11 @@ def list_global_ips(self, version=None, identifier=None, **kwargs):
         kwargs['filter'] = _filter.to_dict()
         return self.account.getGlobalIpRecords(**kwargs)
 
-    def list_subnets(self, identifier=None, datacenter=None, version=0,
-                     subnet_type=None, network_space=None, **kwargs):
+    def list_subnets(self, **kwargs):
         """Display a list of all subnets on the account.
 
         This provides a quick overview of all subnets including information
         about data center residence and the number of devices attached.
-
-        :param string identifier: If specified, the list will only contain the
-                                    subnet matching this network identifier.
-        :param string datacenter: If specified, the list will only contain
-                                    subnets in the specified data center.
-        :param int version: Only returns subnets of this version (4 or 6).
-        :param string subnet_type: If specified, it will only returns subnets
-                                     of this type.
-        :param string network_space: If specified, it will only returns subnets
-                                       with the given address space label.
-        :param dict \\*\\*kwargs: response-level options (mask, limit, etc.)
         """
         if 'mask' not in kwargs:
             kwargs['mask'] = DEFAULT_SUBNET_MASK
@@ -678,7 +666,7 @@ def _list_subnets_by_identifier(self, identifier):
         """
         identifier = identifier.split('/', 1)[0]
 
-        results = self.list_subnets(identifier=identifier, mask='id')
+        results = self.list_subnets()
         return [result['id'] for result in results]
 
     def _list_vlans_by_name(self, name):

tests/managers/network_tests.py

@@ -317,13 +317,7 @@ def test_list_subnets_default(self):
                                 mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
 
     def test_list_subnets_with_filters(self):
-        result = self.network.list_subnets(
-            identifier='10.0.0.1',
-            datacenter='dal00',
-            version=4,
-            subnet_type='PRIMARY',
-            network_space='PUBLIC',
-        )
+        result = self.network.list_subnets()
 
         self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)