Skip to content

#962 fixed image list in rest #1178

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
merged 1 commit into from
Oct 10, 2019
Merged

#962 fixed image list in rest #1178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 7 additions & 17 deletions SoftLayer/CLI/image/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@

@click.command()
@click.option('--name', default=None, help='Filter on image name')
@click.option('--public/--private',
is_flag=True,
default=None,
@click.option('--public/--private', is_flag=True, default=None,
help='Display only public or private images')
@environment.pass_env
def cli(env, name, public):
Expand All @@ -24,30 +22,22 @@ def cli(env, name, public):

images = []
if public in [False, None]:
for image in image_mgr.list_private_images(name=name,
mask=image_mod.MASK):
for image in image_mgr.list_private_images(name=name, mask=image_mod.MASK):
images.append(image)

if public in [True, None]:
for image in image_mgr.list_public_images(name=name,
mask=image_mod.MASK):
for image in image_mgr.list_public_images(name=name, mask=image_mod.MASK):
images.append(image)

table = formatting.Table(['id',
'name',
'type',
'visibility',
'account'])
table = formatting.Table(['id', 'name', 'type', 'visibility', 'account'])

images = [image for image in images if image['parentId'] == '']
images = [image for image in images if not image['parentId']]
for image in images:

visibility = (image_mod.PUBLIC_TYPE if image['publicFlag']
else image_mod.PRIVATE_TYPE)
visibility = (image_mod.PUBLIC_TYPE if image['publicFlag'] else image_mod.PRIVATE_TYPE)
table.add_row([
image.get('id', formatting.blank()),
formatting.FormattedItem(image['name'],
click.wrap_text(image['name'], width=50)),
formatting.FormattedItem(image['name'], click.wrap_text(image['name'], width=50)),
formatting.FormattedItem(
utils.lookup(image, 'imageType', 'keyName'),
utils.lookup(image, 'imageType', 'name')),
Expand Down