openstack
/
monasca-api
Code Issues Proposed changes

Replace iteritems() with items() 

In process of Python 3 support implementation replacing dict.iteritems() with
dict.items().

Change-Id: Ida5caa4d9999daceb381d14659af6d3ba8d2c343
Story: 2000975
Task: 5948
This commit is contained in:
Witold Bedyk 2017-12-14 13:58:52 +01:00
parent ba43f07726
commit 2639d50b3a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/files/schema/influxdb_setup.py
View File

@ -121,7 +121,7 @@ def main(argv=None):
# Create the users
users = influxdb_get(uri=api_uri, query="SHOW USERS", db=DBNAME)
for name, password in USERS.iteritems():
for name, password in USERS.items():
if not any(user[0] == name for user in users):
influxdb_get_post(uri=api_uri,
query=unicode("CREATE USER {0} WITH PASSWORD '{1}'".format(name, password)),

4
monasca_api/common/repositories/cassandra/metrics_repository.py
View File

@ -297,7 +297,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
query = self._build_metrics_by_name_query(tenant_id, region, name, extracted_dimensions,
@ -415,7 +415,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
extracted_dimensions = single_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
names.extend(

10
monasca_tempest_tests/services/monasca_client.py
View File

@ -197,7 +197,7 @@ class MonascaClient(rest_client.RestClient):
request_body['ok_actions'] = ok_actions
request_body['undetermined_actions'] = undetermined_actions
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
request_body[key] = value
resp, response_body = self.put(uri, json.dumps(request_body))
@ -236,7 +236,7 @@ class MonascaClient(rest_client.RestClient):
if undetermined_actions is not None:
request_body['undetermined_actions'] = undetermined_actions
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
request_body[key] = value
resp, response_body = self.patch(uri, json.dumps(request_body))
@ -266,7 +266,7 @@ class MonascaClient(rest_client.RestClient):
request_body['lifecycle_state'] = lifecycle_state
request_body['link'] = link
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
request_body[key] = value
resp, response_body = self.put(uri, json.dumps(request_body))
@ -283,7 +283,7 @@ class MonascaClient(rest_client.RestClient):
if link is not None:
request_body['link'] = link
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
request_body[key] = value
resp, response_body = self.patch(uri, json.dumps(request_body))
@ -328,7 +328,7 @@ class MonascaClient(rest_client.RestClient):
request_body['alarm_actions'] = alarm_actions
request_body['undetermined_actions'] = undetermined_actions
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
request_body[key] = value
resp, response_body = self.put(uri, json.dumps(request_body))