openstack/neutron-vpnaas
Code Issues Proposed changes

Merge "Python 3: use six.iteritems instead of dict.items"

Browse Source
This commit is contained in:
Jenkins 2015-06-03 12:31:31 +00:00 committed by Gerrit Code Review
commit f1b3bd0273
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron_vpnaas/services/vpn/common/netns_wrapper.py
View File

@ -25,6 +25,7 @@ from neutron.i18n import _LE, _LI
from oslo_config import cfg
from oslo_log import log as logging
from oslo_rootwrap import wrapper
import six
LOG = logging.getLogger(__name__)
@ -135,7 +136,7 @@ def execute_with_mount():
LOG.error(_LE('Cannot run without netns, exiting'))
return errno.EINVAL
for path, new_path in conf.mount_paths.iteritems():
for path, new_path in six.iteritems(conf.mount_paths):
if not os.path.isdir(new_path):
# Sometimes all directories are not ready
LOG.debug('%s is not directory', new_path)

5
neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py
View File

@ -32,6 +32,7 @@ from neutron.scheduler import l3_agent_scheduler
from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_plugin
from neutron.tests.unit.extensions import test_l3 as test_l3_plugin
from oslo_config import cfg
import six
import webob.exc
from neutron_vpnaas.db.vpn import vpn_db
@ -461,7 +462,7 @@ class TestVpnaas(VPNPluginDbTestCase):
def _check_policy(self, policy, keys, lifetime):
for k, v in keys:
self.assertEqual(policy[k], v)
for k, v in lifetime.iteritems():
for k, v in six.iteritems(lifetime):
self.assertEqual(policy['lifetime'][k], v)
def test_create_ikepolicy(self):
@ -531,7 +532,7 @@ class TestVpnaas(VPNPluginDbTestCase):
self.assertEqual(len(res), 1)
for k, v in keys:
self.assertEqual(res['ikepolicies'][0][k], v)
for k, v in lifetime.iteritems():
for k, v in six.iteritems(lifetime):
self.assertEqual(res['ikepolicies'][0]['lifetime'][k], v)
def test_list_ikepolicies_with_sort_emulated(self):