diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2017-06-27 18:14:55 +0300 |
|---|---|---|
| committer | Juha Kosonen <juha.kosonen@nokia.com> | 2017-06-27 18:54:25 +0300 |
| commit | 38251180e71629a792c412a7d357a1e59b5eb295 (patch) | |
| tree | 326adab36da3721a263379c4461cb7726f929cf0 /functest/opnfv_tests/openstack/rally | |
| parent | 4ef95523104ea0efc20869b7522e12c6d1b89613 (diff) | |
Remove Rally requests scenario
HttpRequests scenario is not directly related to OpenStack and not
supported by Rally in https environment.
Change-Id: I2e91d129d82dfaba62eca25e3e4890ff54f52ac6
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/rally')
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 5 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml | 11 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/task.yaml | 4 |
3 files changed, 1 insertions, 19 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 8970a5c0..24c9147c 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) class RallyBase(testcase.OSGCTestCase): TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', - 'neutron', 'nova', 'quotas', 'requests', 'vm', 'all'] + 'neutron', 'nova', 'quotas', 'vm', 'all'] GLANCE_IMAGE_NAME = CONST.__getattribute__('openstack_image_name') GLANCE_IMAGE_FILENAME = CONST.__getattribute__('openstack_image_file_name') GLANCE_IMAGE_PATH = os.path.join( @@ -102,9 +102,6 @@ class RallyBase(testcase.OSGCTestCase): else: task_args['netid'] = '' - # get keystone auth endpoint - task_args['request_url'] = CONST.__getattribute__('OS_AUTH_URL') or '' - return task_args def _prepare_test_list(self, test_name): diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml deleted file mode 100644 index 16136978..00000000 --- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml +++ /dev/null @@ -1,11 +0,0 @@ - HttpRequests.check_request: - - - args: - url: "{{ request_url }}" - method: "GET" - status_code: 200 - allow_redirects: True - runner: - {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} - sla: - {{ no_failures_sla() }} diff --git a/functest/opnfv_tests/openstack/rally/task.yaml b/functest/opnfv_tests/openstack/rally/task.yaml index c482f120..033edb83 100644 --- a/functest/opnfv_tests/openstack/rally/task.yaml +++ b/functest/opnfv_tests/openstack/rally/task.yaml @@ -35,10 +35,6 @@ {%- include "var/opnfv-quotas.yaml"-%} {% endif %} -{% if "requests" in service_list %} -{%- include "var/opnfv-requests.yaml"-%} -{% endif %} - {% if "heat" in service_list %} {%- include "var/opnfv-heat.yaml"-%} {% endif %} |