Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Network dashboard - fixing 2 bugs: overriden variable and page token … #1976

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Network dashboard - fixing 2 bugs: overriden variable and page token … #1976

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82cc694
Network dashboard - fixing 2 bugs: overriden variable and page token …
aurelienlegrand Jan 12, 2024
d5bdf50
changing pageToken in the regexp
aurelienlegrand Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions blueprints/cloud-operations/network-quota-monitoring/src/plugins/core-discover-cai-nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def _handle_discovery(resources, response, data):
yield Resource('folders', name, {'name': result['displayName']})
elif asset_type == 'Project':
number = result['project'].split('/')[1]
data = {'number': number, 'project_id': name}
yield Resource('projects', name, data)
yield Resource('projects:number', number, data)
data_proj = {'number': number, 'project_id': name}
ludoo marked this conversation as resolved.
Show resolved Hide resolved
yield Resource('projects', name, data_proj)
yield Resource('projects:number', number, data_proj)
else:
LOGGER.info(f'unknown resource {name}')
next_url = parse_page_token(data, response.request.url)
Expand Down
6 changes: 4 additions & 2 deletions blueprints/cloud-operations/network-quota-monitoring/src/plugins/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ def parse_page_token(data, url):
page_token = data.get('nextPageToken')
if page_token:
logging.info(f'page token {page_token}')
if page_token:
return RE_URL.sub(f'pageToken={page_token}&', url)
if 'pageToken' in url:
return RE_URL.sub(f'pageToken={page_token}', url)
else:
return f'{url}&pageToken={page_token}'
ludoo marked this conversation as resolved.
Show resolved Hide resolved


def poor_man_mp_request(urls, boundary='1234567890'):
Expand Down