From 38251180e71629a792c412a7d357a1e59b5eb295 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Tue, 27 Jun 2017 18:14:55 +0300 Subject: 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 --- functest/opnfv_tests/openstack/rally/rally.py | 5 +---- .../opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml | 11 ----------- functest/opnfv_tests/openstack/rally/task.yaml | 4 ---- functest/tests/unit/openstack/rally/test_rally.py | 8 -------- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml 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 %} diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index b9e78616..8845f660 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -53,14 +53,6 @@ class OSRallyTesting(unittest.TestCase): task_args = self.rally_base._build_task_args('test_file_name') self.assertEqual(task_args['netid'], '') - def test_build_task_args_missing_auth_url(self): - CONST.__setattr__('OS_AUTH_URL', None) - with mock.patch('functest.opnfv_tests.openstack.rally.rally.' - 'os_utils.get_external_net', - return_value='test_floating_network'): - task_args = self.rally_base._build_task_args('test_file_name') - self.assertEqual(task_args['request_url'], '') - def check_scenario_file(self, value): yaml_file = 'opnfv-{}.yaml'.format('test_file_name') if yaml_file in value: -- cgit 1.2.3-korg