fix the team code review comments

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(mask=mask)
+            subnets = net_mgr.list_subnets(datacenter=dc_name, network_space='PRIVATE', mask=mask)
             subnet_table = formatting.Table(['Id', 'Subnet', 'Vlan'], title='Private subnet')
 
             for subnet in subnets:

SoftLayer/CLI/subnet/list.py

@@ -21,8 +21,15 @@
                                  '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):
+def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, ipv6):
     """List subnets."""
 
     mgr = SoftLayer.NetworkManager(env.client)
@@ -33,7 +40,19 @@ def cli(env, sortby):
     ])
     table.sortby = sortby
 
-    subnets = mgr.list_subnets()
+    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,
+    )
 
     for subnet in subnets:
         table.add_row([
@@ -43,7 +62,7 @@ def cli(env, sortby):
             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,15 +470,45 @@ def list_global_ips(self, version=None, identifier=None, **kwargs):
         kwargs['filter'] = _filter.to_dict()
         return self.account.getGlobalIpRecords(**kwargs)
 
-    def list_subnets(self, **kwargs):
+    def list_subnets(self, identifier=None, datacenter=None, version=0,
+                     subnet_type=None, network_space=None, **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
 
+        _filter = utils.NestedDict(kwargs.get('filter') or {})
+
+        if identifier:
+            _filter['subnets']['networkIdentifier'] = (
+                utils.query_filter(identifier))
+        if datacenter:
+            _filter['subnets']['datacenter']['name'] = (
+                utils.query_filter(datacenter))
+        if version:
+            _filter['subnets']['version'] = utils.query_filter(version)
+        if subnet_type:
+            _filter['subnets']['subnetType'] = utils.query_filter(subnet_type)
+
+        if network_space:
+            _filter['subnets']['networkVlan']['networkSpace'] = (
+                utils.query_filter(network_space))
+
+        kwargs['filter'] = _filter.to_dict()
         kwargs['iter'] = True
         return self.client.call('Account', 'getSubnets', **kwargs)
 

tests/managers/network_tests.py

@@ -310,11 +310,29 @@ def test_list_global_ips_with_filter(self):
                                 filter=_filter)
 
     def test_list_subnets_default(self):
-        result = self.network.list_subnets()
-
+        result = self.network.list_subnets(
+            identifier='10.0.0.1',
+            datacenter='dal00',
+            version=4,
+            subnet_type='PRIMARY',
+            network_space='PUBLIC',
+        )
         self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
+        _filter = {
+            'subnets': {
+                'networkIdentifier': {'operation': '_= 10.0.0.1'},
+                'datacenter': {
+                    'name': {'operation': '_= dal00'}
+                },
+                'version': {'operation': 4},
+                'subnetType': {'operation': '_= PRIMARY'},
+                'networkVlan': {'networkSpace': {'operation': '_= PUBLIC'}},
+            }
+        }
+
         self.assert_called_with('SoftLayer_Account', 'getSubnets',
-                                mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
+                                mask='mask[%s]' % network.DEFAULT_SUBNET_MASK,
+                                filter=_filter)
 
     def test_list_subnets_with_filters(self):
         result = self.network.list_subnets()