Skip to content

Commit 76b8e0e

Browse files
caberoscaberos
authored andcommitted
Remove default filter on subnet list and fix the subnet detail
1 parent d19cc48 commit 76b8e0e

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

SoftLayer/CLI/subnet/detail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def cli(env, identifier, no_vs, no_hardware):
3838
table.add_row(['identifier',
3939
'%s/%s' % (subnet['networkIdentifier'],
4040
str(subnet['cidr']))])
41-
table.add_row(['subnet type', subnet['subnetType']])
41+
table.add_row(['subnet type', subnet.get('subnetType', formatting.blank())])
4242
table.add_row(['network space',
4343
utils.lookup(subnet, 'networkVlan', 'networkSpace')])
4444
table.add_row(['gateway', subnet.get('gateway', formatting.blank())])

SoftLayer/managers/network.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -491,26 +491,6 @@ def list_subnets(self, identifier=None, datacenter=None, version=0,
491491
if 'mask' not in kwargs:
492492
kwargs['mask'] = DEFAULT_SUBNET_MASK
493493

494-
_filter = utils.NestedDict(kwargs.get('filter') or {})
495-
496-
if identifier:
497-
_filter['subnets']['networkIdentifier'] = (
498-
utils.query_filter(identifier))
499-
if datacenter:
500-
_filter['subnets']['datacenter']['name'] = (
501-
utils.query_filter(datacenter))
502-
if version:
503-
_filter['subnets']['version'] = utils.query_filter(version)
504-
if subnet_type:
505-
_filter['subnets']['subnetType'] = utils.query_filter(subnet_type)
506-
else:
507-
# This filters out global IPs from the subnet listing.
508-
_filter['subnets']['subnetType'] = {'operation': '!= GLOBAL_IP'}
509-
if network_space:
510-
_filter['subnets']['networkVlan']['networkSpace'] = (
511-
utils.query_filter(network_space))
512-
513-
kwargs['filter'] = _filter.to_dict()
514494
kwargs['iter'] = True
515495
return self.client.call('Account', 'getSubnets', **kwargs)
516496

0 commit comments

Comments
 (0)