Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of PageSize for ELB/ELBv2

Browse Source 
Resolves #1497
This commit is contained in:
Dave Golombek 2018-03-05 16:52:56 -05:00
parent 553d074241
commit 73a1c03580
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/elb/responses.py
View File

@ -61,7 +61,7 @@ class ELBResponse(BaseResponse):
start = all_names.index(marker) + 1 start = all_names.index(marker) + 1
else: else:
start = 0 start = 0
page_size = self._get_param('PageSize', 50) # the default is 400, but using 50 to make testing easier page_size = self._get_int_param('PageSize', 50) # the default is 400, but using 50 to make testing easier
load_balancers_resp = all_load_balancers[start:start + page_size] load_balancers_resp = all_load_balancers[start:start + page_size]
next_marker = None next_marker = None
if len(all_load_balancers) > start + page_size: if len(all_load_balancers) > start + page_size:

6
moto/elbv2/responses.py
View File

@ -242,7 +242,7 @@ class ELBV2Response(BaseResponse):
start = all_names.index(marker) + 1 start = all_names.index(marker) + 1
else: else:
start = 0 start = 0
page_size = self._get_param('PageSize', 50) # the default is 400, but using 50 to make testing easier page_size = self._get_int_param('PageSize', 50) # the default is 400, but using 50 to make testing easier
load_balancers_resp = all_load_balancers[start:start + page_size] load_balancers_resp = all_load_balancers[start:start + page_size]
next_marker = None next_marker = None
if len(all_load_balancers) > start + page_size: if len(all_load_balancers) > start + page_size:
@ -468,7 +468,7 @@ class ELBV2Response(BaseResponse):
def describe_account_limits(self): def describe_account_limits(self):
# Supports paging but not worth implementing yet # Supports paging but not worth implementing yet
# marker = self._get_param('Marker') # marker = self._get_param('Marker')
# page_size = self._get_param('PageSize') # page_size = self._get_int_param('PageSize')
limits = { limits = {
'application-load-balancers': 20, 'application-load-balancers': 20,
@ -489,7 +489,7 @@ class ELBV2Response(BaseResponse):
names = self._get_multi_param('Names.member.') names = self._get_multi_param('Names.member.')
# Supports paging but not worth implementing yet # Supports paging but not worth implementing yet
# marker = self._get_param('Marker') # marker = self._get_param('Marker')
# page_size = self._get_param('PageSize') # page_size = self._get_int_param('PageSize')
policies = SSL_POLICIES policies = SSL_POLICIES
if names: if names: