Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix indentation
  • Loading branch information
Yixin Shi committed Jan 14, 2019
commit 7ec1f8e3251547cfab08d4d1fc1f5633361a5087
15 changes: 8 additions & 7 deletions tools/cli/commands/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ def _check_instance_allowed(instance, status_tags_and_metadata):
if 'datalab' in items:
return
else:
_license = ('https://www.googleapis.com/compute/v1/projects/'
'click-to-deploy-images/global/licenses/c2d-tensorflow')
disks = status_tags_and_metadata.get('disks', [])
for disk in disks:
if _license in disk.get('licenses', []):
return
_license = ('https://www.googleapis.com/compute/v1/projects/'
'click-to-deploy-images/global/licenses/c2d-tensorflow')
disks = status_tags_and_metadata.get('disks', [])
for disk in disks:
if _license in disk.get('licenses', []):
return

raise InvalidInstanceException(instance)

Expand Down Expand Up @@ -296,7 +296,8 @@ def describe_instance(args, gcloud_compute, instance):
if args.zone:
get_cmd.extend(['--zone', args.zone])
get_cmd.extend(
['--format', 'json(status,tags.items,metadata.items,disks[].licenses)', instance])
['--format', 'json(status,tags.items,metadata.items,disks[].licenses)',
instance])
with tempfile.TemporaryFile() as stdout, \
tempfile.TemporaryFile() as stderr:
try:
Expand Down