pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve id extraction for apps and portfolios

Browse Source
This commit is contained in:
tomdds 2019-11-18 13:47:42 -05:00
parent 9b64d26961
commit 84e5fa9bd1
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
load-test/locustfile.py
View File

@ -1,4 +1,5 @@
import os import os
import re
from random import choice, choices, randrange from random import choice, choices, randrange
from urllib.parse import urlparse from urllib.parse import urlparse
@ -37,6 +38,19 @@ def get_csrf_token(response):
return d("#csrf_token").val() return d("#csrf_token").val()
def extract_id(path):
entity_id_matcher = re.compile(
".*\/?(?:portfolios|applications)\/([0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}).*",
re.I,
)
entity_id_match = entity_id_matcher.match(path)
assert entity_id_match is not None, f"Could not find id in {path}"
if entity_id_match:
return entity_id_match.group(1)
def get_portfolios(l): def get_portfolios(l):
response = l.client.get("/portfolios") response = l.client.get("/portfolios")
d = pq(response.text) d = pq(response.text)
@ -62,7 +76,7 @@ def get_portfolio(l):
for p in d(".application-list .accordion__actions a:first-child").items() for p in d(".application-list .accordion__actions a:first-child").items()
] ]
if len(application_links) > 0: if len(application_links) > 0:
portfolio_id = portfolio_link.split("/")[-2] portfolio_id = extract_id(portfolio_link)
update_app_registry(l, portfolio_id, application_links) update_app_registry(l, portfolio_id, application_links)
@ -78,7 +92,7 @@ def get_app(l):
if app_link is not None and not force_new_app: if app_link is not None and not force_new_app:
l.client.get(app_link) l.client.get(app_link)
else: else:
portfolio_id = choice(l.locust.portfolio_links).split("/")[-2] portfolio_id = extract_id(choice(l.locust.portfolio_links))
update_app_registry(l, portfolio_id, [create_new_app(l, portfolio_id)]) update_app_registry(l, portfolio_id, [create_new_app(l, portfolio_id)])
@ -98,6 +112,7 @@ def create_new_app(l, portfolio_id):
} }
create_app_response = l.client.post(create_app_url, create_app_body) create_app_response = l.client.post(create_app_url, create_app_body)
application_id = extract_id(create_app_response.url)
create_environments_body = { create_environments_body = {
"environment_names-0": "Development", "environment_names-0": "Development",
@ -107,7 +122,6 @@ def create_new_app(l, portfolio_id):
"csrf_token": get_csrf_token(create_app_response), "csrf_token": get_csrf_token(create_app_response),
} }
application_id = create_app_response.url.split("/")[-3]
create_environments_url = ( create_environments_url = (
f"/applications/{application_id}/new/step_2?portfolio_id={portfolio_id}" f"/applications/{application_id}/new/step_2?portfolio_id={portfolio_id}"
) )