Merge pull request #914 from SoftLayer/issues896

Added Direct Link network space to vlan list

Author: allmightyspiff

plugin/commands/vlan/list.go

@@ -118,22 +118,24 @@ func (cmd *ListCommand) Run(args []string) error {
 	table := cmd.UI.Table(headers)
 
 	for _, vlan := range vlans {
-		var premium string
+		premium := T("No")
 		if vlan.BillingItem != nil {
 			premium = T("Yes")
-		} else {
-			premium = T("No")
 		}
 		datacenterName := ""
 		if vlan.Datacenter != nil && vlan.Datacenter.Name != nil {
 			datacenterName = utils.FormatStringPointer(vlan.Datacenter.Name)
 		}
+		networkSpace := "Direct Link"
+		if vlan.NetworkSpace != nil {
+			networkSpace = cases.Title(language.Und).String(utils.FormatStringPointer(vlan.NetworkSpace))
+		}
 		table.Add(
 			utils.FormatIntPointer(vlan.Id),
 			utils.FormatIntPointer(vlan.VlanNumber),
 			utils.FormatStringPointer(vlan.FullyQualifiedName),
 			utils.FormatStringPointer(vlan.Name),
-			cases.Title(language.Und).String(utils.FormatStringPointer(vlan.NetworkSpace)),
+			networkSpace,
 			datacenterName,
 			getPodWithClosedAnnouncement(vlan, pods),
 			getFirewallGateway(vlan),

plugin/managers/network.go

@@ -462,10 +462,10 @@ destinationIpAddress[ipAddress,virtualGuest.fullyQualifiedDomainName,hardware.fu
 func (n networkManager) ListVlans(datacenter string, vlanNum int, name string, orderId int, mask string) ([]datatypes.Network_Vlan, error) {
 	DEFAULT_VLAN_MASK := `mask[
 id, vlanNumber, fullyQualifiedName, name, networkSpace, datacenter[name], podName,
-firewallInterfaces, billingItem, tagReferences[tag[name]],
+firewallInterfaces, billingItem[id], tagReferences[tag[name]],
 hardwareCount,subnetCount,totalPrimaryIpAddressCount,virtualGuestCount,
 networkVlanFirewall[id,fullyQualifiedDomainName,primaryIpAddress],
-attachedNetworkGateway[id,name,networkFirewall]
+attachedNetworkGateway[id,name]
 ]`
 
 	filters := filter.New()