Skip to content

Commit fbddb02

Browse files
committed
get last page of network groups
1 parent 020c8ea commit fbddb02

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

netfoundry/ctl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ def use_network_group(cli, organization: object, group: str = None, spinner: obj
11741174
with spinner:
11751175
network_group = NetworkGroup(
11761176
organization,
1177-
group=group if group else None,
1177+
group=group,
11781178
)
11791179
spinner.succeed(f"Configured network group '{network_group.name}'")
11801180
cli.log.debug(f"network group is {network_group.name}")

netfoundry/utility.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,13 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
393393
yield yield_page
394394

395395
# then yield subsequent pages, if applicable
396-
if get_all_pages: # this is False if param 'page' or 'size' to stop recursion or get a single page
397-
for next_page in range(1, total_pages): # first page is 0
396+
if get_all_pages: # this is False if param 'page' or 'size' to stop recursion or get a single page
397+
if resource_type.name == 'network-groups':
398+
params['page'] = 1 # workaround API bug https://netfoundry.atlassian.net/browse/MOP-17890
399+
next_range_lower, next_range_upper = params['page'] + 2, total_pages + 1
400+
else:
401+
next_range_lower, next_range_upper = params['page'] + 1, total_pages
402+
for next_page in range(next_range_lower, next_range_upper): # first page is 0 unless network-groups which are 1-based
398403
params['page'] = next_page
399404
try:
400405
# recurse

0 commit comments

Comments
 (0)