diff --git a/monasca_api/common/repositories/cassandra/metrics_repository.py b/monasca_api/common/repositories/cassandra/metrics_repository.py index 6b9659b07..d5b4cfa1e 100644 --- a/monasca_api/common/repositories/cassandra/metrics_repository.py +++ b/monasca_api/common/repositories/cassandra/metrics_repository.py @@ -55,7 +55,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): sub_dimensions = {} if dimensions: - for key, value in dimensions.iteritems(): + for key, value in dimensions.items(): if not value: sub_dimensions[key] = value @@ -77,7 +77,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): extracted_dimensions = sub_dimensions.copy() for dims in iter(or_dims_tuple): - for k, v in dims.iteritems(): + for k, v in dims.items(): extracted_dimensions[k] = v metrics = self._list_metrics(tenant_id, region, name, @@ -142,7 +142,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): if include_metric_hash: metric[u'metric_hash'] = metric_hash - for name, value in metric_map.iteritems(): + for name, value in metric_map.items(): if name == '__name__': @@ -175,7 +175,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): dimension_clause = '' if dimensions: - for name, value in dimensions.iteritems(): + for name, value in dimensions.items(): if not value: dimension_clause += ' and metric_map contains key %s ' @@ -353,7 +353,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): for row in rows: metric_map = row.metric_map - for name, value in metric_map.iteritems(): + for name, value in metric_map.items(): if name == '__name__': value = urllib.unquote_plus(value) @@ -693,7 +693,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): for row in rows: metric_map = row.metric_map - for name, value in metric_map.iteritems(): + for name, value in metric_map.items(): name = urllib.unquote_plus(name) value = urllib.unquote_plus(value) @@ -730,7 +730,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): for row in rows: metric_map = row.metric_map - for name, value in metric_map.iteritems(): + for name, value in metric_map.items(): name = urllib.unquote_plus(name) dim_name = {u'dimension_name': name} diff --git a/monasca_api/common/repositories/influxdb/metrics_repository.py b/monasca_api/common/repositories/influxdb/metrics_repository.py index 7577919b4..a6f7010ff 100644 --- a/monasca_api/common/repositories/influxdb/metrics_repository.py +++ b/monasca_api/common/repositories/influxdb/metrics_repository.py @@ -263,7 +263,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): # dimensions - optional if dimensions: for dimension_name, dimension_value in iter( - sorted(dimensions.iteritems())): + sorted(dimensions.items())): # replace ' with \' to make query parsable clean_dimension_name = dimension_name.replace("\'", "\\'") if dimension_value == "": @@ -601,7 +601,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): if not group_by: measurement[u'dimensions'] = dimensions else: - measurement[u'dimensions'] = {key: value for key, value in serie['tags'].iteritems() + measurement[u'dimensions'] = {key: value for key, value in serie['tags'].items() if not key.startswith('_')} json_measurement_list.append(measurement) @@ -712,7 +712,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository): if not group_by: statistic[u'dimensions'] = dimensions else: - statistic[u'dimensions'] = {key: value for key, value in serie['tags'].iteritems() + statistic[u'dimensions'] = {key: value for key, value in serie['tags'].items() if not key.startswith('_')} json_statistics_list.append(statistic) diff --git a/monasca_api/common/repositories/model/sub_alarm_definition.py b/monasca_api/common/repositories/model/sub_alarm_definition.py index e5c517e58..1757d3415 100644 --- a/monasca_api/common/repositories/model/sub_alarm_definition.py +++ b/monasca_api/common/repositories/model/sub_alarm_definition.py @@ -104,7 +104,7 @@ class SubAlarmDefinition(object): def __hash__(self): dimensions_str = "".join(sorted([name + value for name, value in - self.dimensions.iteritems()])) + self.dimensions.items()])) # don't use id to hash. return (hash(self.alarm_definition_id) ^ diff --git a/monasca_api/common/repositories/sqla/alarm_definitions_repository.py b/monasca_api/common/repositories/sqla/alarm_definitions_repository.py index 8abfc1e4f..ed2ea1836 100644 --- a/monasca_api/common/repositories/sqla/alarm_definitions_repository.py +++ b/monasca_api/common/repositories/sqla/alarm_definitions_repository.py @@ -288,7 +288,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository, query_from = query_from.join(sad, sadi == ad.c.id) i = 0 - for n, v in dimensions.iteritems(): + for n, v in dimensions.items(): bind_dimension_name = 'b_sadd_dimension_name_{}'.format(i) bind_value = 'b_sadd_value_{}'.format(i) sadd_ = (select([sadd.c.sub_alarm_definition_id]) @@ -575,7 +575,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository, parms = [] for sub_alarm_definition_id, sub_alarm_def in ( - changed_sub_alarm_defs_by_id.iteritems()): + changed_sub_alarm_defs_by_id.items()): parms.append({'b_operator': sub_alarm_def.operator, 'b_threshold': sub_alarm_def.threshold, 'b_is_deterministic': sub_alarm_def.deterministic, diff --git a/monasca_api/tests/test_alarms.py b/monasca_api/tests/test_alarms.py index 58c9b3fc4..85fe2f02b 100644 --- a/monasca_api/tests/test_alarms.py +++ b/monasca_api/tests/test_alarms.py @@ -622,7 +622,7 @@ class TestAlarmDefinition(AlarmTestBase): result_def = json.loads(result[0]) self.assertEqual(result_def, expected_def) - for key, value in alarm_def.iteritems(): + for key, value in alarm_def.items(): del alarm_def[key] self.simulate_request("/v2.0/alarm-definitions/%s" % expected_def[u'id'],