openstack
/
magnum
Code Issues Proposed changes

Merge "Replace dict.iteritems() with dict.items()"

This commit is contained in:
Jenkins 2015-12-23 20:41:05 +00:00 committed by Gerrit Code Review
parent 29d0c685d3 3086de9ed6
commit 783713efd3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/api/attr_validator.py
View File

@ -14,7 +14,6 @@
from glanceclient import exc as glance_exception
from novaclient import exceptions as nova_exception
import six
from magnum.api import utils as api_utils
from magnum.common import clients
@ -87,7 +86,7 @@ def validate_os_resources(context, baymodel_id):
baymodel = BayModel.get_by_uuid(context, baymodel_id)
cli = clients.OpenStackClients(context)
for attr, validate_method in six.iteritems(validators):
for attr, validate_method in validators.items():
if attr in baymodel and baymodel[attr] is not None:
validate_method(cli, baymodel[attr])

4
magnum/tests/unit/db/test_magnum_service.py
View File

@ -87,7 +87,7 @@ class DbMagnumServiceTestCase(base.DbTestCase):
res = self.dbapi.get_magnum_service_list(self.context)
self.assertEqual(1, len(res))
res = res[0]
for k, v in fake_ms_params.iteritems():
for k, v in fake_ms_params.items():
self.assertEqual(res[k], v)
fake_ms_params['binary'] = 'FakeBin1'
@ -96,5 +96,5 @@ class DbMagnumServiceTestCase(base.DbTestCase):
res = self.dbapi.get_magnum_service_list(self.context, disabled=True)
self.assertEqual(1, len(res))
res = res[0]
for k, v in fake_ms_params.iteritems():
for k, v in fake_ms_params.items():
self.assertEqual(res[k], v)