Merge pull request #1357 from caberos/issue1355

Refactor file and block commands to use the username resolver

Author: allmightyspiff

SoftLayer/CLI/block/access/list.py

@@ -6,6 +6,7 @@
 from SoftLayer.CLI import columns as column_helper
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 from SoftLayer.CLI import storage_utils
 
 
@@ -21,8 +22,9 @@
 def cli(env, columns, sortby, volume_id):
     """List ACLs."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
+    resolved_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Volume Id')
     access_list = block_manager.get_block_volume_access_list(
-        volume_id=volume_id)
+        volume_id=resolved_id)
     table = formatting.Table(columns.columns)
     table.sortby = sortby
 

SoftLayer/CLI/block/snapshot/list.py

@@ -6,6 +6,7 @@
 from SoftLayer.CLI import columns as column_helper
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 
 COLUMNS = [
@@ -38,8 +39,9 @@
 def cli(env, volume_id, sortby, columns):
     """List block storage snapshots."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
+    resolved_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Volume Id')
     snapshots = block_manager.get_block_volume_snapshot_list(
-        volume_id,
+        resolved_id,
         mask=columns.mask()
     )
 

SoftLayer/CLI/block/subnets/list.py

@@ -5,6 +5,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 
 COLUMNS = [
@@ -26,7 +27,8 @@ def cli(env, access_id):
 
     try:
         block_manager = SoftLayer.BlockStorageManager(env.client)
-        subnets = block_manager.get_subnets_in_acl(access_id)
+        resolved_id = helpers.resolve_id(block_manager.resolve_ids, access_id, 'Volume Id')
+        subnets = block_manager.get_subnets_in_acl(resolved_id)
 
         table = formatting.Table(COLUMNS)
         for subnet in subnets:

SoftLayer/CLI/file/access/list.py

@@ -6,6 +6,7 @@
 from SoftLayer.CLI import columns as column_helper
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 from SoftLayer.CLI import storage_utils
 
 
@@ -21,8 +22,9 @@
 def cli(env, columns, sortby, volume_id):
     """List ACLs."""
     file_manager = SoftLayer.FileStorageManager(env.client)
+    resolved_id = helpers.resolve_id(file_manager.resolve_ids, volume_id, 'Volume Id')
     access_list = file_manager.get_file_volume_access_list(
-        volume_id=volume_id)
+        volume_id=resolved_id)
     table = formatting.Table(columns.columns)
     table.sortby = sortby
 

SoftLayer/CLI/file/snapshot/list.py

@@ -6,7 +6,7 @@
 from SoftLayer.CLI import columns as column_helper
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
-
+from SoftLayer.CLI import helpers
 
 COLUMNS = [
     column_helper.Column('id', ('id',), mask='id'),
@@ -38,8 +38,9 @@
 def cli(env, volume_id, sortby, columns):
     """List file storage snapshots."""
     file_manager = SoftLayer.FileStorageManager(env.client)
+    resolved_id = helpers.resolve_id(file_manager.resolve_ids, volume_id, 'Volume Id')
     snapshots = file_manager.get_file_volume_snapshot_list(
-        volume_id,
+        resolved_id,
         mask=columns.mask()
     )