diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2016-06-13 10:35:49 +0000 |
|---|---|---|
| committer | Juha Kosonen <juha.kosonen@nokia.com> | 2016-06-13 11:20:06 +0000 |
| commit | 8111a1371e4221d0224b388e5896ce29c8d7e7e0 (patch) | |
| tree | 65abac29f2cfe3eb9f848410ec584c81068366f0 | |
| parent | 050ced665b9c364857c1c8b056d9c57069fd0dc5 (diff) | |
Remove external server references on Rally scenarios
Use url derived from OS_AUTH_URL on a scenario making http request and
checking the response. This way successful test execution does not
require internet connection nor rely on external servers functionality.
JIRA: FUNCTEST-201
Change-Id: Ic11f8f5c32d015624bdec1db07d8bb49f7b77bc8
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
| -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: |