Skip to content

Refactor file and block commands to use the username resolver #1357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allmightyspiff merged 2 commits into from
Oct 5, 2020
Merged

Refactor file and block commands to use the username resolver #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d8102c
Refactor file and block commands to use the username resolver
Oct 1, 2020
c709a55
fix tox analysis
Oct 1, 2020
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
4 changes: 3 additions & 1 deletion SoftLayer/CLI/block/access/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion SoftLayer/CLI/block/snapshot/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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()
)

Expand Down
4 changes: 3 additions & 1 deletion SoftLayer/CLI/block/subnets/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import SoftLayer
from SoftLayer.CLI import environment
from SoftLayer.CLI import formatting
from SoftLayer.CLI import helpers


COLUMNS = [
Expand All @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion SoftLayer/CLI/file/access/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions SoftLayer/CLI/file/snapshot/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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()
)

Expand Down