Skip to content

Commit 662b060

Browse files
committed
Solved comments
1 parent 27ed7fa commit 662b060

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

SoftLayer/CLI/vlan/list.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
def cli(env, sortby, datacenter, number, name, limit):
4141
"""List VLANs.
4242
43-
Note: In field Pod, if add (*) indicated that closed soon
43+
Note: A * Indicates a POD is closing soon. Ex:[red] Pod01* [/red]
4444
"""
4545

4646
mgr = SoftLayer.NetworkManager(env.client)
@@ -53,7 +53,9 @@ def cli(env, sortby, datacenter, number, name, limit):
5353
name=name,
5454
limit=limit)
5555

56-
pods = mgr.get_pods_with_capabilities()
56+
mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
57+
backendRouterName, frontendRouterName]"""
58+
pods = mgr.get_pods(mask=mask)
5759

5860
for vlan in vlans:
5961
billing = 'Yes' if vlan.get('billingItem') else 'No'
@@ -84,7 +86,7 @@ def get_pod_with_closed_announcement(vlan, pods):
8486
or utils.lookup(pod, 'frontendRouterId') == utils.lookup(vlan, 'primaryRouter', 'id'):
8587
if 'CLOSURE_ANNOUNCED' in utils.lookup(pod, 'capabilities'):
8688
name_pod = utils.lookup(pod, 'name').split('.')[1] + '*'
87-
return name_pod.capitalize()
89+
return "[red]" + name_pod.capitalize() + "[/red]"
8890
else:
8991
return utils.lookup(pod, 'name').split('.')[1].capitalize()
9092
return ''

SoftLayer/managers/network.py

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -786,17 +786,25 @@ def cancel_item(self, identifier, cancel_immediately,
786786
customer_note,
787787
id=identifier)
788788

789-
def get_pods(self, datacenter=None):
789+
def get_pods(self, datacenter=None, mask=None):
790790
"""Calls SoftLayer_Network_Pod::getAllObjects()
791791
792792
returns list of all network pods and their routers.
793793
"""
794-
_filter = None
795-
794+
_filter = {
795+
'name': {
796+
'operation': 'orderBy',
797+
'options': [{'name': 'sort', 'value': ['DESC']}]
798+
}
799+
}
796800
if datacenter:
797801
_filter = {"datacenterName": {"operation": datacenter}}
798802

799-
return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', filter=_filter)
803+
_mask = None
804+
if mask:
805+
_mask = mask
806+
807+
return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', mask=_mask, filter=_filter)
800808

801809
def get_list_datacenter(self):
802810
"""Calls SoftLayer_Location::getDatacenters()
@@ -866,19 +874,3 @@ def get_datacenter_by_keyname(self, keyname=None):
866874
if len(result) >= 1:
867875
return result[0]
868876
return {}
869-
870-
def get_pods_with_capabilities(self):
871-
"""Calls SoftLayer_Network_Pod::getAllObjects()
872-
873-
returns list of all pods with capabilities for see closing network pods.
874-
"""
875-
order_filter = {
876-
'name': {
877-
'operation': 'orderBy',
878-
'options': [{'name': 'sort', 'value': ['DESC']}]
879-
}
880-
}
881-
882-
mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
883-
backendRouterName, frontendRouterName]"""
884-
return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', mask=mask, filter=order_filter)

0 commit comments

Comments
 (0)