From 10c19b6f6fb69bc42b68245c9ccc4e6176c357b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Fri, 27 Jan 2017 09:44:25 +0100 Subject: [PATCH] [PEP8] Extended code analysis Following commits makes tempests code compliant with PEP8 rules Change-Id: I08e0a001c3fd56201db71babc894a18d63706895 --- .../services/monasca_client.py | 9 ++-- monasca_tempest_tests/tests/api/base.py | 4 +- .../tests/api/test_alarm_definitions.py | 29 ++++++----- .../tests/api/test_alarm_transitions.py | 48 +++++++++++-------- .../tests/api/test_alarms.py | 6 +-- .../tests/api/test_alarms_count.py | 8 +--- .../tests/api/test_dimensions.py | 13 ++--- .../tests/api/test_measurements.py | 2 +- .../tests/api/test_metrics.py | 21 ++++---- .../tests/api/test_metrics_names.py | 2 +- .../api/test_notification_method_type.py | 13 +---- .../tests/api/test_notification_methods.py | 13 ++--- .../tests/api/test_read_only_role.py | 6 +-- .../tests/api/test_statistics.py | 4 +- tox.ini | 9 +++- 15 files changed, 94 insertions(+), 93 deletions(-) diff --git a/monasca_tempest_tests/services/monasca_client.py b/monasca_tempest_tests/services/monasca_client.py index 31fe989bc..39eb27d57 100644 --- a/monasca_tempest_tests/services/monasca_client.py +++ b/monasca_tempest_tests/services/monasca_client.py @@ -134,12 +134,9 @@ class MonascaClient(rest_client.RestClient): resp, response_body = self.put(uri, json.dumps(request_body)) return resp, json.loads(response_body) - def patch_notification_method(self, - id, - name=None, - type=None, - address=None, - period=None): + def patch_notification_method(self, id, + name=None, type=None, + address=None, period=None): uri = 'notification-methods/' + id request_body = {} if name is not None: diff --git a/monasca_tempest_tests/tests/api/base.py b/monasca_tempest_tests/tests/api/base.py index 8f35a8442..cbffbbaeb 100644 --- a/monasca_tempest_tests/tests/api/base.py +++ b/monasca_tempest_tests/tests/api/base.py @@ -13,10 +13,10 @@ # under the License. import six.moves.urllib.parse as urlparse -from tempest import config from tempest.common import credentials_factory -import tempest.test +from tempest import config from tempest.lib import exceptions +import tempest.test from monasca_tempest_tests import clients diff --git a/monasca_tempest_tests/tests/api/test_alarm_definitions.py b/monasca_tempest_tests/tests/api/test_alarm_definitions.py index 126a214ca..7f37501df 100644 --- a/monasca_tempest_tests/tests/api/test_alarm_definitions.py +++ b/monasca_tempest_tests/tests/api/test_alarm_definitions.py @@ -15,13 +15,14 @@ import time import six.moves.urllib.parse as urlparse +from tempest.common.utils import data_utils +from tempest.lib import exceptions +from tempest import test from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers -from tempest.common.utils import data_utils -from tempest import test -from tempest.lib import exceptions + NUM_ALARM_DEFINITIONS = 2 @@ -493,10 +494,10 @@ class TestAlarmDefinitions(base.BaseMonascaTest): create_alarm_definitions(alarm_definition) self.assertEqual(201, resp.status) - - query_param = '?severity=MEDIUM|LOW&dimensions=alarm:severity&sort_by=severity' - resp, response_body = self.monasca_client.\ - list_alarm_definitions(query_param) + query_param = ('?severity=MEDIUM|LOW&dimensions=alarm:severity' + '&sort_by=severity') + resp, response_body = (self.monasca_client + .list_alarm_definitions(query_param)) self._verify_list_alarm_definitions_response_body(resp, response_body) elements = response_body['elements'] self._verify_alarm_definitions_list(elements, [res_body_create_alarm_def_low, @@ -550,8 +551,8 @@ class TestAlarmDefinitions(base.BaseMonascaTest): sort_params1 = ['id', 'name', 'severity'] for sort_by in sort_params1: - alarmdefs_sort_by = sorted(alarm_definitions, key=lambda - definition: definition[sort_by]) + alarmdefs_sort_by = sorted(alarm_definitions, + key=lambda d: d[sort_by]) resp, response_body = self.monasca_client.list_alarm_definitions( '?dimensions=' + str(key) + ':' + str(value) + @@ -567,8 +568,9 @@ class TestAlarmDefinitions(base.BaseMonascaTest): for i, element in enumerate(response_body['elements']): self.assertEqual(alarmdefs_sort_by[i][sort_by], element[sort_by]) - alarmdefs_sort_by_reverse = sorted(alarm_definitions, key=lambda - definition: definition[sort_by], reverse=True) + alarmdefs_sort_by_reverse = sorted(alarm_definitions, + key=lambda d: d[sort_by], + reverse=True) resp, response_body = self.monasca_client.list_alarm_definitions( '?dimensions=' + str(key) + ':' + str(value) + @@ -598,7 +600,7 @@ class TestAlarmDefinitions(base.BaseMonascaTest): '&sort_by=' + sort_by + urlparse.quote(' desc')) self.assertEqual(200, resp.status) for i, element in enumerate(response_body['elements']): - self.assertEqual(alarm_definitions[-i-1]['id'], element['id']) + self.assertEqual(alarm_definitions[-i - 1]['id'], element['id']) @test.attr(type='gate') def test_list_alarm_definitions_multiple_sort_by(self): @@ -674,7 +676,8 @@ class TestAlarmDefinitions(base.BaseMonascaTest): new_elements = response_body['elements'] self.assertEqual(limit, len(new_elements)) self.assertEqual(elements[offset], new_elements[0]) - self.assertEqual(elements[offset+limit-1], new_elements[-1]) + self.assertEqual(elements[offset + limit - 1], + new_elements[-1]) links = response_body['links'] for link in links: if link['rel'] == 'next': diff --git a/monasca_tempest_tests/tests/api/test_alarm_transitions.py b/monasca_tempest_tests/tests/api/test_alarm_transitions.py index 3616bde24..16094d698 100644 --- a/monasca_tempest_tests/tests/api/test_alarm_transitions.py +++ b/monasca_tempest_tests/tests/api/test_alarm_transitions.py @@ -14,11 +14,12 @@ import time -import base -from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils from tempest import test +from monasca_tempest_tests.tests.api import base +from monasca_tempest_tests.tests.api import helpers + WAIT_SECS = 10 @@ -64,16 +65,19 @@ class TestAlarmTransitions(base.BaseMonascaTest): @test.attr(type="gate") def test_alarm_max_function(self): - metric_def = {'name': data_utils.rand_name("max_test"), - 'dimensions': { - 'dim_to_match': data_utils.rand_name("max_match") - }} + metric_def = { + 'name': data_utils.rand_name("max_test"), + 'dimensions': { + 'dim_to_match': data_utils.rand_name("max_match") + } + } expression = "max(" + metric_def['name'] + ") > 14" definition = helpers.create_alarm_definition(name="Test Max Function", description="", expression=expression, match_by=["dim_to_match"]) - resp, resp_body = self.monasca_client.create_alarm_definitions(definition) + resp, resp_body = (self.monasca_client + .create_alarm_definitions(definition)) self.assertEqual(201, resp.status) definition_id = resp_body['id'] time.sleep(1) @@ -89,10 +93,12 @@ class TestAlarmTransitions(base.BaseMonascaTest): @test.attr(type="gate") def test_alarm_max_with_deterministic(self): - metric_def = {'name': data_utils.rand_name("max_deterministic_test"), - 'dimensions': { - 'dim_to_match': data_utils.rand_name("max_match") - }} + metric_def = { + 'name': data_utils.rand_name("max_deterministic_test"), + 'dimensions': { + 'dim_to_match': data_utils.rand_name("max_match") + } + } expression = "max(" + metric_def['name'] + ",deterministic) > 14" definition = helpers.create_alarm_definition(name="Test Max Deterministic Function", description="", @@ -114,10 +120,12 @@ class TestAlarmTransitions(base.BaseMonascaTest): @test.attr(type="gate") def test_alarm_last_function(self): - metric_def = {'name': data_utils.rand_name("last_test"), - 'dimensions': { - 'dim_to_match': data_utils.rand_name("last_match") - }} + metric_def = { + 'name': data_utils.rand_name("last_test"), + 'dimensions': { + 'dim_to_match': data_utils.rand_name("last_match") + } + } expression = "last(" + metric_def['name'] + ") > 14" definition = helpers.create_alarm_definition(name="Test Last Function", description="", @@ -143,10 +151,12 @@ class TestAlarmTransitions(base.BaseMonascaTest): @test.attr(type="gate") def test_alarm_last_with_deterministic(self): - metric_def = {'name': data_utils.rand_name("last_deterministic_test"), - 'dimensions': { - 'dim_to_match': data_utils.rand_name("last_match") - }} + metric_def = { + 'name': data_utils.rand_name("last_deterministic_test"), + 'dimensions': { + 'dim_to_match': data_utils.rand_name("last_match") + } + } expression = "last(" + metric_def['name'] + ",deterministic) > 14" definition = helpers.create_alarm_definition(name="Test Last Deterministic Function", description="", diff --git a/monasca_tempest_tests/tests/api/test_alarms.py b/monasca_tempest_tests/tests/api/test_alarms.py index a927310e5..a77b3eccd 100644 --- a/monasca_tempest_tests/tests/api/test_alarms.py +++ b/monasca_tempest_tests/tests/api/test_alarms.py @@ -20,8 +20,8 @@ from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils -from tempest import test from tempest.lib import exceptions +from tempest import test class TestAlarms(base.BaseMonascaTest): @@ -133,7 +133,7 @@ class TestAlarms(base.BaseMonascaTest): self._wait_for_alarms(1, alarm_def_id) query_dimensions = [key + ':' + value for key, value in metric['dimensions'].items()] - query_parms="?metric_dimensions=" + ','.join(query_dimensions) + query_parms = "?metric_dimensions=" + ','.join(query_dimensions) resp, response_body = self.monasca_client.list_alarms(query_parms) self._verify_list_alarms_elements(resp, response_body, @@ -192,7 +192,6 @@ class TestAlarms(base.BaseMonascaTest): self.assertIn(metric_2['dimensions'], dimension_sets) self.assertNotIn(metric_3['dimensions'], dimension_sets) - @test.attr(type="gate") def test_list_alarms_by_metric_dimensions_multi_value(self): metric_name = data_utils.rand_name('metric') @@ -238,7 +237,6 @@ class TestAlarms(base.BaseMonascaTest): self.assertIn(metric_2['dimensions'], dimension_sets) self.assertNotIn(metric_3['dimensions'], dimension_sets) - @test.attr(type="gate") def test_list_alarms_by_state(self): helpers.delete_alarm_definitions(self.monasca_client) diff --git a/monasca_tempest_tests/tests/api/test_alarms_count.py b/monasca_tempest_tests/tests/api/test_alarms_count.py index 10ed8be8a..811d8278b 100644 --- a/monasca_tempest_tests/tests/api/test_alarms_count.py +++ b/monasca_tempest_tests/tests/api/test_alarms_count.py @@ -17,14 +17,15 @@ import time from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils -from tempest import test from tempest.lib import exceptions +from tempest import test GROUP_BY_ALLOWED_PARAMS = {'alarm_definition_id', 'name', 'state', 'severity', 'link', 'lifecycle_state', 'metric_name', 'dimension_name', 'dimension_value'} + class TestAlarmsCount(base.BaseMonascaTest): @classmethod @@ -155,7 +156,6 @@ class TestAlarmsCount(base.BaseMonascaTest): msg = "Failed to create all specified alarms during setup, alarm_count was {}".format(alarm_count) assert False, msg - @classmethod def resource_cleanup(cls): for definition_id in cls.alarm_definition_ids: @@ -227,11 +227,9 @@ class TestAlarmsCount(base.BaseMonascaTest): if alarm['state'] is 'ALARM' and alarm['severity'] is 'LOW': alarm_low_count += 1 - resp, response_body = self.monasca_client.count_alarms("?group_by=state,severity") self._verify_counts_format(response_body, group_by=['state', 'severity']) - # test with filter parameters @test.attr(type='gate') def test_filter_params(self): @@ -303,8 +301,6 @@ class TestAlarmsCount(base.BaseMonascaTest): group_by=['metric_name', 'dimension_name', 'dimension_value'], expected_length=1) - - @test.attr(type='gate') def test_offset(self): resp, response_body = self.monasca_client.count_alarms( diff --git a/monasca_tempest_tests/tests/api/test_dimensions.py b/monasca_tempest_tests/tests/api/test_dimensions.py index f65f21644..81219f3cf 100644 --- a/monasca_tempest_tests/tests/api/test_dimensions.py +++ b/monasca_tempest_tests/tests/api/test_dimensions.py @@ -13,14 +13,15 @@ # under the License. import time +from urllib import urlencode + +from tempest.common.utils import data_utils +from tempest.lib import exceptions +from tempest import test from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers -from tempest.common.utils import data_utils -from tempest import test -from tempest.lib import exceptions -from urllib import urlencode class TestDimensions(base.BaseMonascaTest): @@ -145,7 +146,7 @@ class TestDimensions(base.BaseMonascaTest): xrange(response_values_length)] self.assertEqual(num_expected_elements, len(new_elements)) - expected_elements = elements[start_index:start_index+limit] + expected_elements = elements[start_index:start_index + limit] expected_dimension_values = \ [expected_elements[i]['dimension_value'] for i in xrange( len(expected_elements))] @@ -213,7 +214,7 @@ class TestDimensions(base.BaseMonascaTest): xrange(response_names_length)] self.assertEqual(num_expected_elements, len(new_elements)) - expected_elements = elements[start_index:start_index+limit] + expected_elements = elements[start_index:start_index + limit] expected_dimension_names = \ [expected_elements[i]['dimension_name'] for i in xrange( len(expected_elements))] diff --git a/monasca_tempest_tests/tests/api/test_measurements.py b/monasca_tempest_tests/tests/api/test_measurements.py index 2bfb108ea..4f34dfa7e 100644 --- a/monasca_tempest_tests/tests/api/test_measurements.py +++ b/monasca_tempest_tests/tests/api/test_measurements.py @@ -18,8 +18,8 @@ from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils -from tempest import test from tempest.lib import exceptions +from tempest import test NUM_MEASUREMENTS = 50 ONE_SECOND = 1000 diff --git a/monasca_tempest_tests/tests/api/test_metrics.py b/monasca_tempest_tests/tests/api/test_metrics.py index 4535d2a69..123a7609a 100644 --- a/monasca_tempest_tests/tests/api/test_metrics.py +++ b/monasca_tempest_tests/tests/api/test_metrics.py @@ -15,14 +15,16 @@ # TODO(RMH): Check if ' should be added in the list of INVALID_CHARS. # TODO(RMH): test_create_metric_no_value, should return 422 if value not sent import time + from six.moves import range as xrange +from tempest.common.utils import data_utils +from tempest.lib import exceptions +from tempest import test + from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers -from tempest.common.utils import data_utils -from tempest import test -from tempest.lib import exceptions class TestMetrics(base.BaseMonascaTest): @@ -287,11 +289,8 @@ class TestMetrics(base.BaseMonascaTest): @test.attr(type=['negative']) def test_create_metric_with_value_meta_name_exceeds_max_length(self): long_value_meta_name = "x" * (constants.MAX_VALUE_META_NAME_LENGTH + 1) - metric = helpers.create_metric(name='name', - value_meta= - {long_value_meta_name: - "value_meta_value"} - ) + value_meta_dict = {long_value_meta_name: "value_meta_value"} + metric = helpers.create_metric(name='name', value_meta=value_meta_dict) self.assertRaises(exceptions.UnprocessableEntity, self.monasca_client.create_metrics, metric) @@ -301,10 +300,8 @@ class TestMetrics(base.BaseMonascaTest): def test_create_metric_with_value_meta_exceeds_max_length(self): value_meta_name = "x" long_value_meta_value = "y" * constants.MAX_VALUE_META_TOTAL_LENGTH - metric = helpers.create_metric(name='name', - value_meta= - {value_meta_name: long_value_meta_value} - ) + value_meta_dict = {value_meta_name: long_value_meta_value} + metric = helpers.create_metric(name='name', value_meta=value_meta_dict) self.assertRaises(exceptions.UnprocessableEntity, self.monasca_client.create_metrics, metric) diff --git a/monasca_tempest_tests/tests/api/test_metrics_names.py b/monasca_tempest_tests/tests/api/test_metrics_names.py index 882d81f41..227a1e06e 100644 --- a/monasca_tempest_tests/tests/api/test_metrics_names.py +++ b/monasca_tempest_tests/tests/api/test_metrics_names.py @@ -113,7 +113,7 @@ class TestMetricsNames(base.BaseMonascaTest): new_elements = self._verify_response(resp, response_body) self.assertEqual(num_expected_elements, len(new_elements)) - expected_elements = elements[start_index:start_index+limit] + expected_elements = elements[start_index:start_index + limit] expected_names = \ [expected_elements[i]['name'] for i in xrange( len(expected_elements))] diff --git a/monasca_tempest_tests/tests/api/test_notification_method_type.py b/monasca_tempest_tests/tests/api/test_notification_method_type.py index 479112943..e71e2ee8e 100644 --- a/monasca_tempest_tests/tests/api/test_notification_method_type.py +++ b/monasca_tempest_tests/tests/api/test_notification_method_type.py @@ -12,16 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import time - -import six.moves.urllib.parse as urlparse - from monasca_tempest_tests.tests.api import base -from monasca_tempest_tests.tests.api import constants -from monasca_tempest_tests.tests.api import helpers -from tempest.common.utils import data_utils from tempest import test -from tempest.lib import exceptions class TestNotificationMethodType(base.BaseMonascaTest): @@ -36,7 +28,6 @@ class TestNotificationMethodType(base.BaseMonascaTest): @test.attr(type="gate") def test_list_notification_method_type(self): - - resp, response_body = self.monasca_client.list_notification_method_types() + resp, response_body = (self.monasca_client. + list_notification_method_types()) self.assertEqual(200, resp.status) - diff --git a/monasca_tempest_tests/tests/api/test_notification_methods.py b/monasca_tempest_tests/tests/api/test_notification_methods.py index a2fa58705..3732a7543 100644 --- a/monasca_tempest_tests/tests/api/test_notification_methods.py +++ b/monasca_tempest_tests/tests/api/test_notification_methods.py @@ -20,8 +20,8 @@ from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils -from tempest import test from tempest.lib import exceptions +from tempest import test DEFAULT_EMAIL_ADDRESS = 'john.doe@domain.com' @@ -366,8 +366,8 @@ class TestNotificationMethods(base.BaseMonascaTest): sort_params1 = ['id', 'name', 'type', 'address'] for sort_by in sort_params1: - notif_sorted_by = sorted(notifications, key=lambda - notification: notification[sort_by]) + notif_sorted_by = sorted(notifications, + key=lambda obj: obj[sort_by]) resp, response_body = self.monasca_client.list_notification_methods( '?sort_by=' + sort_by) @@ -381,8 +381,9 @@ class TestNotificationMethods(base.BaseMonascaTest): for i, element in enumerate(response_body['elements']): self.assertEqual(notif_sorted_by[i][sort_by], element[sort_by]) - notif_sorted_by_reverse = sorted(notifications, key=lambda - notification: notification[sort_by], reverse=True) + notif_sorted_by_reverse = sorted(notifications, + key=lambda obj: obj[sort_by], + reverse=True) resp, response_body = self.monasca_client.list_notification_methods( '?sort_by=' + sort_by + urlparse.quote(' desc')) @@ -408,7 +409,7 @@ class TestNotificationMethods(base.BaseMonascaTest): '?sort_by=' + sort_by + urlparse.quote(' desc')) self.assertEqual(200, resp.status) for i, element in enumerate(response_body['elements']): - self.assertEqual(notifications[-i-1]['id'], element['id']) + self.assertEqual(notifications[-i - 1]['id'], element['id']) for notification in notifications: self.monasca_client.delete_notification_method(notification['id']) diff --git a/monasca_tempest_tests/tests/api/test_read_only_role.py b/monasca_tempest_tests/tests/api/test_read_only_role.py index 2ed3aa0b7..4e96d6e17 100644 --- a/monasca_tempest_tests/tests/api/test_read_only_role.py +++ b/monasca_tempest_tests/tests/api/test_read_only_role.py @@ -13,12 +13,12 @@ import time -from monasca_tempest_tests.tests.api import base -from monasca_tempest_tests.tests.api import helpers -from tempest import test from tempest.lib import exceptions +from tempest import test from monasca_tempest_tests import clients +from monasca_tempest_tests.tests.api import base +from monasca_tempest_tests.tests.api import helpers class TestReadOnlyRole(base.BaseMonascaTest): diff --git a/monasca_tempest_tests/tests/api/test_statistics.py b/monasca_tempest_tests/tests/api/test_statistics.py index ac0d6fc58..a9cace6ad 100644 --- a/monasca_tempest_tests/tests/api/test_statistics.py +++ b/monasca_tempest_tests/tests/api/test_statistics.py @@ -20,8 +20,8 @@ from monasca_tempest_tests.tests.api import base from monasca_tempest_tests.tests.api import constants from monasca_tempest_tests.tests.api import helpers from tempest.common.utils import data_utils -from tempest import test from tempest.lib import exceptions +from tempest import test from urllib import urlencode NUM_MEASUREMENTS = 100 @@ -294,7 +294,7 @@ class TestStatistics(base.BaseMonascaTest): new_elements = response_body['elements'][0]['statistics'] self.assertEqual(num_expected_elements, len(new_elements)) - expected_elements = elements[start_index:start_index+limit] + expected_elements = elements[start_index:start_index + limit] self.assertEqual(expected_elements, new_elements) start_index += num_expected_elements if start_index >= num_metrics: diff --git a/tox.ini b/tox.ini index ae30d74ab..b07c3897e 100644 --- a/tox.ini +++ b/tox.ini @@ -54,9 +54,16 @@ commands = {[testenv]commands} oslo_debug_helper -t ./monasca_api/tests {posargs} -[testenv:pep8] +[testenv:flake8] commands = flake8 monasca_api + flake8 monasca_tempest_tests + +[testenv:pep8] +deps = + {[testenv]deps} +commands = + {[testenv:flake8]commands} [testenv:venv] commands = {posargs}