Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Ryan Hanson <ryan@megacosm.net>
Scott Thompson <sthompson@softlayer.com>
Sergio Carlos <carloschilazo@gmail.com>
Shane Poage <spoage@softlayer.com>
Shravan Kumar Raghu <sraghu@us.ibm.com>
simplydave <dgjohns@gmail.com>
SoftLayer <sldn@softlayer.com>
suppandi <suppandi@gmail.com>
Expand Down
6 changes: 6 additions & 0 deletions SoftLayer/CLI/file/detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ def cli(env, volume_id):
file_volume['serviceResourceBackendIpAddress'],
])

if file_volume['fileNetworkMountAddress']:
table.add_row([
'Mount Address',
file_volume['fileNetworkMountAddress'],
])

if file_volume['snapshotCapacityGb']:
table.add_row([
'Snapshot Capacity (GB)',
Expand Down
5 changes: 4 additions & 1 deletion SoftLayer/CLI/file/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
mask="serviceResourceBackendIpAddress"),
column_helper.Column('active_transactions', ('activeTransactionCount',),
mask="activeTransactionCount"),
column_helper.Column('mount_addr', ('fileNetworkMountAddress',),
mask="fileNetworkMountAddress",),
column_helper.Column(
'created_by',
('billingItem', 'orderItem', 'order', 'userRecord', 'username')),
Expand All @@ -40,7 +42,8 @@
'capacity_gb',
'bytes_used',
'ip_addr',
'active_transactions'
'active_transactions',
'mount_addr'
]


Expand Down
1 change: 1 addition & 0 deletions SoftLayer/fixtures/SoftLayer_Account.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@
'password': 'pass',
'serviceResourceBackendIpAddress': '127.0.0.1',
'storageType': {'keyName': 'ENDURANCE_STORAGE'},
'fileNetworkMountAddress': '127.0.0.1:/TEST',
}]

getActiveQuotes = [{
Expand Down
1 change: 1 addition & 0 deletions SoftLayer/fixtures/SoftLayer_Network_Storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
}],
'serviceResource': {'datacenter': {'id': 449500, 'name': 'dal05'}},
'serviceResourceBackendIpAddress': '10.1.2.3',
'fileNetworkMountAddress': '127.0.0.1:/TEST',
'serviceResourceName': 'Storage Type 01 Aggregate staaspar0101_pc01',
'username': 'username',
'storageType': {'keyName': 'ENDURANCE_STORAGE'},
Expand Down
4 changes: 3 additions & 1 deletion SoftLayer/managers/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ def list_file_volumes(self, datacenter=None, username=None,
'bytesUsed',
'serviceResource.datacenter[name]',
'serviceResourceBackendIpAddress',
'activeTransactionCount'
'activeTransactionCount',
'fileNetworkMountAddress'
]
kwargs['mask'] = ','.join(items)

Expand Down Expand Up @@ -81,6 +82,7 @@ def get_file_volume_details(self, volume_id, **kwargs):
'storageType.keyName',
'serviceResource.datacenter[name]',
'serviceResourceBackendIpAddress',
'fileNetworkMountAddress',
'storageTierLevel',
'iops',
'lunId',
Expand Down
4 changes: 3 additions & 1 deletion tests/CLI/modules/file_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ def test_volume_list(self):
'ip_addr': '127.0.0.1',
'storage_type': 'ENDURANCE',
'username': 'user',
'active_transactions': None
'active_transactions': None,
'mount_addr': '127.0.0.1:/TEST'
}],
json.loads(result.output))

Expand Down Expand Up @@ -122,6 +123,7 @@ def test_volume_detail(self):
'Used Space': '0B',
'Endurance Tier': '2 IOPS per GB',
'IOPs': 1000,
'Mount Address': '127.0.0.1:/TEST',
'Snapshot Capacity (GB)': '10',
'Snapshot Used (Bytes)': 1024,
'Capacity (GB)': '20GB',
Expand Down