Merge pull request #1966 from caberos/issue1962

update the network vlan on hardware detail

Author: allmightyspiff

SoftLayer/CLI/hardware/detail.py

@@ -9,6 +9,7 @@
 from SoftLayer.CLI import helpers
 from SoftLayer import utils
 
+
 # pylint: disable=R0915
 
 
@@ -71,9 +72,11 @@ def cli(env, identifier, passwords, price, components):
     table.add_row(['last_transaction', last_transaction])
     table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else 'Monthly'])
 
-    vlan_table = formatting.Table(['type', 'number', 'id'])
+    vlan_table = formatting.Table(['type', 'number', 'id', 'name', 'netmask'])
     for vlan in result['networkVlans']:
-        vlan_table.add_row([vlan['networkSpace'], vlan['vlanNumber'], vlan['id']])
+        vlan_table.add_row([vlan['networkSpace'], vlan['vlanNumber'],
+                            vlan['id'], vlan['fullyQualifiedName'],
+                            vlan['primarySubnets'][0]['netmask']])
 
     table.add_row(['vlans', vlan_table])
 

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -57,12 +57,20 @@
         {
             'networkSpace': 'PRIVATE',
             'vlanNumber': 1800,
-            'id': 9653
+            'id': 9653,
+            'fullyQualifiedName': 'dal10.bcr03.14752',
+            'primarySubnets': [{
+                'netmask': ''
+            }]
         },
         {
             'networkSpace': 'PUBLIC',
             'vlanNumber': 3672,
-            'id': 19082
+            'id': 19082,
+            'fullyQualifiedName': 'dal10.test03.123',
+            'primarySubnets': [{
+                'netmask': ''
+            }]
         },
     ],
     'tagReferences': [

SoftLayer/managers/hardware.py

@@ -269,7 +269,7 @@ def get_hardware(self, hardware_id, **kwargs):
                 'lastTransaction[transactionGroup],'
                 'hourlyBillingFlag,'
                 'tagReferences[id,tag[name,id]],'
-                'networkVlans[id,vlanNumber,networkSpace],'
+                'networkVlans[id,vlanNumber,networkSpace, fullyQualifiedName,primarySubnets[ipAddresses]],'
                 'monitoringServiceComponent,networkMonitors[queryType,lastResult,responseAction],'
                 'remoteManagementAccounts[username,password]'
             )