Updated command - slcli vlan list

Author: edsonarios

SoftLayer/CLI/vlan/list.py

@@ -9,16 +9,19 @@
 from SoftLayer.CLI.vlan.detail import get_gateway_firewall
 from SoftLayer import utils
 
-COLUMNS = ['id',
-           'number',
-           'name',
+COLUMNS = ['Id',
+           'Number',
+           'Fully qualified name',
+           'Name',
+           'Network',
+           'Data center',
+           'Pod',
            'Gateway/Firewall',
-           'datacenter',
-           'hardware',
-           'virtual_servers',
-           'public_ips',
-           'premium',
-           'tag']
+           'Hardware',
+           'Virtual servers',
+           'Public ips',
+           'Premium',
+           'Tags']
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
@@ -35,7 +38,10 @@
               show_default=True)
 @environment.pass_env
 def cli(env, sortby, datacenter, number, name, limit):
-    """List VLANs."""
+    """List VLANs.
+
+    Note: In field Pod, if add (*) indicated that closed soon
+    """
 
     mgr = SoftLayer.NetworkManager(env.client)
 
@@ -46,15 +52,21 @@ def cli(env, sortby, datacenter, number, name, limit):
                            vlan_number=number,
                            name=name,
                            limit=limit)
+
+    pods = mgr.get_pods_with_capabilities()
+
     for vlan in vlans:
         billing = 'Yes' if vlan.get('billingItem') else 'No'
 
         table.add_row([
             vlan.get('id'),
             vlan.get('vlanNumber'),
+            vlan.get('fullyQualifiedName'),
             vlan.get('name') or formatting.blank(),
-            get_gateway_firewall(vlan),
+            vlan.get('networkSpace').capitalize(),
             utils.lookup(vlan, 'primaryRouter', 'datacenter', 'name'),
+            get_pod_with_closed_announcement(vlan, pods),
+            get_gateway_firewall(vlan),
             vlan.get('hardwareCount'),
             vlan.get('virtualGuestCount'),
             vlan.get('totalPrimaryIpAddressCount'),
@@ -63,3 +75,16 @@ def cli(env, sortby, datacenter, number, name, limit):
         ])
 
     env.fout(table)
+
+
+def get_pod_with_closed_announcement(vlan, pods):
+    """Gets pods with announcement to close"""
+    for pod in pods:
+        if utils.lookup(pod, 'backendRouterId') == utils.lookup(vlan, 'primaryRouter', 'id') \
+                or utils.lookup(pod, 'frontendRouterId') == utils.lookup(vlan, 'primaryRouter', 'id'):
+            if 'CLOSURE_ANNOUNCED' in utils.lookup(pod, 'capabilities'):
+                name_pod = utils.lookup(pod, 'name').split('.')[1] + '*'
+                return name_pod.capitalize()
+            else:
+                return utils.lookup(pod, 'name').split('.')[1].capitalize()
+    return ''

SoftLayer/managers/network.py

@@ -866,3 +866,19 @@ def get_datacenter_by_keyname(self, keyname=None):
         if len(result) >= 1:
             return result[0]
         return {}
+
+    def get_pods_with_capabilities(self):
+        """Calls SoftLayer_Network_Pod::getAllObjects()
+
+        returns list of all pods with capabilities for see closing network pods.
+        """
+        order_filter = {
+            'name': {
+                'operation': 'orderBy',
+                'options': [{'name': 'sort', 'value': ['DESC']}]
+            }
+        }
+
+        mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
+                backendRouterName, frontendRouterName]"""
+        return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', mask=mask, filter=order_filter)