Merge pull request #1645 from caberos/issue1644

add new columns on vlan list(premium, tags)

Author: allmightyspiff

SoftLayer/CLI/vlan/list.py

@@ -16,7 +16,9 @@
            'datacenter',
            'hardware',
            'virtual_servers',
-           'public_ips']
+           'public_ips',
+           'premium',
+           'tag']
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
@@ -45,6 +47,8 @@ def cli(env, sortby, datacenter, number, name, limit):
                            name=name,
                            limit=limit)
     for vlan in vlans:
+        billing = 'Yes' if vlan.get('billingItem') else 'No'
+
         table.add_row([
             vlan.get('id'),
             vlan.get('vlanNumber'),
@@ -54,6 +58,8 @@ def cli(env, sortby, datacenter, number, name, limit):
             vlan.get('hardwareCount'),
             vlan.get('virtualGuestCount'),
             vlan.get('totalPrimaryIpAddressCount'),
+            billing,
+            formatting.tags(vlan['tagReferences'])
         ])
 
     env.fout(table)

SoftLayer/fixtures/SoftLayer_Account.py

@@ -501,6 +501,7 @@
     'totalPrimaryIpAddressCount': 1,
     'subnetCount': 0,
     'subnets': [],
+    'tagReferences': [],
     'firewallInterfaces': [
         {
             'id': 1,
@@ -538,6 +539,7 @@
     'firewallInterfaces': [],
 
     'subnetCount': 0,
+    'tagReferences': [],
     'subnets': [],
 }, {
     'id': 3,
@@ -561,6 +563,7 @@
     'totalPrimaryIpAddressCount': 3,
     'subnetCount': 0,
     'subnets': [],
+    'tagReferences': [],
     'virtualGuestCount': 1,
     'virtualGuests': [{'id': 3}]
 }]
@@ -1173,7 +1176,7 @@
             "virtualizationPlatform": 0,
             "requiredUser": "administrator@vsphere.local"
         }
-}
+    }
 ]
 
 getActiveVirtualLicenses = [{

SoftLayer/fixtures/SoftLayer_Network_Vlan.py

@@ -13,7 +13,8 @@
         'id': 235689,
         'notes': 'test cli',
         'orderItemId': 147258,
-    }
+    },
+    'tagReferences': [],
 }
 
 editObject = True

SoftLayer/managers/network.py

@@ -40,11 +40,13 @@
     'hardwareCount',
     'primaryRouter[id, fullyQualifiedDomainName, datacenter]',
     'subnetCount',
+    'billingItem',
     'totalPrimaryIpAddressCount',
     'virtualGuestCount',
     'networkSpace',
     'networkVlanFirewall[id,fullyQualifiedDomainName,primaryIpAddress]',
     'attachedNetworkGateway[id,name,networkFirewall]',
+    'tagReferences[tag[name]]',
 ])
 DEFAULT_GET_VLAN_MASK = ','.join([
     'firewallInterfaces',