Merge pull request #1721 from softlayer/issue1718

Add Devices with Trunks to vlan detail

Author: allmightyspiff

SoftLayer/CLI/vlan/detail.py

@@ -18,14 +18,23 @@
 @click.option('--no-hardware',
               is_flag=True,
               help="Hide hardware listing")
+@click.option('--no-trunks',
+              is_flag=True,
+              help="Hide devices with trunks")
 @environment.pass_env
-def cli(env, identifier, no_vs, no_hardware):
+def cli(env, identifier, no_vs, no_hardware, no_trunks):
     """Get details about a VLAN."""
-
     mgr = SoftLayer.NetworkManager(env.client)
 
     vlan_id = helpers.resolve_id(mgr.resolve_vlan_ids, identifier, 'VLAN')
-    vlan = mgr.get_vlan(vlan_id)
+
+    mask = """mask[firewallInterfaces,primaryRouter[id, fullyQualifiedDomainName, datacenter],
+    totalPrimaryIpAddressCount,networkSpace,billingItem,hardware,subnets,virtualGuests,
+    networkVlanFirewall[id,fullyQualifiedDomainName,primaryIpAddress],attachedNetworkGateway[id,name,networkFirewall],
+    networkComponentTrunks[networkComponent[downlinkComponent[networkComponentGroup[membersDescription],
+    hardware[tagReferences]]]]]"""
+
+    vlan = mgr.get_vlan(vlan_id, mask=mask)
 
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'r'
@@ -51,7 +60,7 @@ def cli(env, identifier, no_vs, no_hardware):
         # subnets.append(subnet_table)
         table.add_row(['subnets', subnet_table])
     else:
-        table.add_row(['subnets', 'none'])
+        table.add_row(['subnets', '-'])
 
     server_columns = ['hostname', 'domain', 'public_ip', 'private_ip']
 
@@ -65,7 +74,7 @@ def cli(env, identifier, no_vs, no_hardware):
                                   vsi.get('primaryBackendIpAddress')])
             table.add_row(['vs', vs_table])
         else:
-            table.add_row(['vs', 'none'])
+            table.add_row(['vs', '-'])
 
     if not no_hardware:
         if vlan.get('hardware'):
@@ -77,7 +86,22 @@ def cli(env, identifier, no_vs, no_hardware):
                                   hardware.get('primaryBackendIpAddress')])
             table.add_row(['hardware', hw_table])
         else:
-            table.add_row(['hardware', 'none'])
+            table.add_row(['hardware', '-'])
+
+    if not no_trunks:
+        if vlan.get('networkComponentTrunks'):
+            trunks = filter_trunks(vlan.get('networkComponentTrunks'))
+            trunks_table = formatting.Table(['device', 'port', 'tags'])
+            for trunk in trunks:
+                trunks_table.add_row([utils.lookup(trunk, 'networkComponent', 'downlinkComponent',
+                                                   'hardware', 'fullyQualifiedDomainName'),
+                                      utils.lookup(trunk, 'networkComponent', 'downlinkComponent',
+                                                   'networkComponentGroup', 'membersDescription'),
+                                      formatting.tags(utils.lookup(trunk, 'networkComponent', 'downlinkComponent',
+                                                                   'hardware', 'tagReferences'))])
+            table.add_row(['trunks', trunks_table])
+        else:
+            table.add_row(['trunks', '-'])
 
     env.fout(table)
 
@@ -92,3 +116,14 @@ def get_gateway_firewall(vlan):
     if gateway:
         return gateway
     return formatting.blank()
+
+
+def filter_trunks(trunks):
+    """Filter duplicates devices with trunks of the vlan."""
+    trunk_filters = []
+    hardware_id = []
+    for trunk in trunks:
+        if utils.lookup(trunk, 'networkComponent', 'downlinkComponent', 'hardwareId') not in hardware_id:
+            trunk_filters.append(trunk)
+            hardware_id.append(utils.lookup(trunk, 'networkComponent', 'downlinkComponent', 'hardwareId'))
+    return trunk_filters

SoftLayer/managers/network.py

@@ -429,15 +429,21 @@ def get_subnet(self, subnet_id, **kwargs):
 
         return self.subnet.getObject(id=subnet_id, **kwargs)
 
-    def get_vlan(self, vlan_id):
+    def get_vlan(self, vlan_id, mask=None):
         """Returns information about a single VLAN.
 
-        :param int id: The unique identifier for the VLAN
+        :param int vlan_id: The unique identifier for the VLAN
+        :param string mask: mask for request
         :returns: A dictionary containing a large amount of information about
                   the specified VLAN.
-
         """
-        return self.vlan.getObject(id=vlan_id, mask=DEFAULT_GET_VLAN_MASK)
+
+        if mask:
+            _mask = mask
+        else:
+            _mask = DEFAULT_GET_VLAN_MASK
+
+        return self.vlan.getObject(id=vlan_id, mask=_mask)
 
     def list_global_ips(self, version=None, identifier=None, **kwargs):
         """Returns a list of all global IP address records on the account.