saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Address PR feedback

Browse source
This commit is contained in:
rmcintosh 2018-05-24 14:58:42 -04:00 • committed by rallytime
parent 50bce3a2f3
commit 83565c55df
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/cloud/clouds/linode.py
View file

@ -1009,7 +1009,7 @@ def get_password(vm_):
def _decode_linode_plan_label(label):
"""
'''
Attempts to decode a user-supplied Linode plan label
into the format in Linode API output
@ -1018,7 +1018,7 @@ def _decode_linode_plan_label(label):
Example:
`Linode 2048` will decode to `Linode 2GB`
"""
'''
sizes = avail_sizes()
if label not in sizes:
@ -1037,8 +1037,9 @@ def _decode_linode_plan_label(label):
plan_type = plan[0]
try:
plan_size = int(plan[1])
except Exception as e:
except TypeError:
plan_size = 0
log.debug('Failed to decode user-supplied Linode plan label: %s', label)
if plan_type == "Linode" and plan_size == 1024:
plan_type = "Nanode"
@ -1087,7 +1088,7 @@ def get_plan_id(kwargs=None, call=None):
'The get_plan_id function requires a \'label\'.'
)
label = decode_linode_plan_label(label)
label = _decode_linode_plan_label(label)
return label