[cloud] Remove custom pagination function in ec2_launchconfig module (#28574)

This commit is contained in:
Sloane Hertel 2017-08-29 13:52:45 -04:00 committed by Ryan Brown
parent 9822db610b
commit e05eebcb50
2 changed files with 3 additions and 34 deletions

View file

@ -332,37 +332,6 @@ def ec2_connect(module):
return ec2
def paging(pause=0, marker_property='marker', result_key=None):
""" Adds paging to boto retrieval functions that support a 'marker'
this is configurable as not all boto functions seem to use the
same name.
"""
def wrapper(f):
def page(*args, **kwargs):
results = []
marker = None
while True:
try:
if marker:
kwargs[marker_property] = marker
new = f(*args, **kwargs)
marker = new.get(marker_property)
if result_key:
new = new[result_key]
results.extend(new)
if not marker:
break
elif pause:
sleep(pause)
except TypeError:
# Older version of boto do not allow for marker param, just run normally
results = f(*args, **kwargs)
break
return results
return page
return wrapper
def _camel_to_snake(name):
def prepend_underscore_and_lower(m):