diff options
Diffstat (limited to 'testcases/OpenStack')
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 6 | ||||
| -rw-r--r-- | testcases/OpenStack/rally/scenario/opnfv-requests.yaml | 21 |
2 files changed, 8 insertions, 19 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 6bb29b8e0..a8628bc51 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -196,6 +196,12 @@ def build_task_args(test_file_name): task_args['netid'] = str(net_id) task_args['live_migration'] = live_migration_supported() + auth_url = os.getenv('OS_AUTH_URL') + if auth_url is not None: + task_args['request_url'] = auth_url.rsplit(":", 1)[0] + else: + task_args['request_url'] = '' + return task_args diff --git a/testcases/OpenStack/rally/scenario/opnfv-requests.yaml b/testcases/OpenStack/rally/scenario/opnfv-requests.yaml index 6affcc6c6..161369786 100644 --- a/testcases/OpenStack/rally/scenario/opnfv-requests.yaml +++ b/testcases/OpenStack/rally/scenario/opnfv-requests.yaml @@ -1,27 +1,10 @@ - HttpRequests.check_random_request: - - - args: - requests: - - - url: "http://www.example.com" - method: "GET" - status_code: 200 - - - url: "http://www.openstack.org" - method: "GET" - status_code: 200 - runner: - {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} - sla: - {{ no_failures_sla() }} - HttpRequests.check_request: - args: - url: "http://www.example.com" + url: "{{ request_url }}" method: "GET" status_code: 200 - allow_redirects: False + allow_redirects: True runner: {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: |