diff --git a/neutron_lbaas/agent_scheduler.py b/neutron_lbaas/agent_scheduler.py index d2c947e84..2bcd4e867 100644 --- a/neutron_lbaas/agent_scheduler.py +++ b/neutron_lbaas/agent_scheduler.py @@ -19,7 +19,6 @@ from neutron.db import agentschedulers_db from neutron.db.models import agent as agents_db from neutron_lib.db import model_base from oslo_log import log as logging -import six import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import joinedload @@ -69,7 +68,7 @@ class LbaasAgentSchedulerDbMixin(agentschedulers_db.AgentSchedulerDbMixin, if active is not None: query = query.filter_by(admin_state_up=active) if filters: - for key, value in six.iteritems(filters): + for key, value in filters.items(): column = getattr(agents_db.Agent, key, None) if column: query = query.filter(column.in_(value)) diff --git a/neutron_lbaas/services/loadbalancer/plugin.py b/neutron_lbaas/services/loadbalancer/plugin.py index 549c8b181..60ab54447 100644 --- a/neutron_lbaas/services/loadbalancer/plugin.py +++ b/neutron_lbaas/services/loadbalancer/plugin.py @@ -14,7 +14,6 @@ # under the License. import copy -import six from neutron_lib.plugins import directory @@ -1045,7 +1044,7 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2, status["provisioning_status"] = obj.provisioning_status if "operating_status" not in exclude: status["operating_status"] = obj.operating_status - for key, value in six.iteritems(kw): + for key, value in kw.items(): status[key] = value try: status['name'] = getattr(obj, 'name') diff --git a/neutron_lbaas/tests/tempest/v2/scenario/base.py b/neutron_lbaas/tests/tempest/v2/scenario/base.py index cc6bd33fe..29cb5da36 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/base.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/base.py @@ -21,7 +21,6 @@ import tempfile import time from oslo_log import log as logging -import six from six.moves import http_cookiejar from six.moves.urllib import error from six.moves.urllib import request as urllib2 @@ -213,14 +212,14 @@ class BaseTestCase(manager.NetworkScenarioTest): self.assertEqual(len(self.servers_keypairs), 2) def _stop_server(self): - for name, value in six.iteritems(self.servers): + for name, value in self.servers.items(): if name == 'primary': self.servers_client.stop_server(value) waiters.wait_for_server_status(self.servers_client, value, 'SHUTOFF') def _start_server(self): - for name, value in six.iteritems(self.servers): + for name, value in self.servers.items(): if name == 'primary': self.servers_client.start(value) waiters.wait_for_server_status(self.servers_client, @@ -232,7 +231,7 @@ class BaseTestCase(manager.NetworkScenarioTest): 1. SSH to the instance 2. Start two http backends listening on ports 80 and 88 respectively """ - for server_id, ip in six.iteritems(self.server_ips): + for server_id, ip in self.server_ips.items(): private_key = self.servers_keypairs[server_id]['private_key'] server = self.servers_client.show_server(server_id)['server'] server_name = server['name'] @@ -352,7 +351,7 @@ class BaseTestCase(manager.NetworkScenarioTest): In case there is only one server, create both members with the same ip but with different ports to listen on. """ - for server_id, ip in six.iteritems(self.server_fixed_ips): + for server_id, ip in self.server_fixed_ips.items(): if len(self.server_fixed_ips) == 1: member1 = self.members_client.create_member( pool_id=pool_id, @@ -497,7 +496,7 @@ class BaseTestCase(manager.NetworkScenarioTest): self._check_connection(self.vip_ip, port=port) counters = self._send_requests(self.vip_ip, ["server1", "server2"]) - for member, counter in six.iteritems(counters): + for member, counter in counters.items(): self.assertGreater(counter, 0, 'Member %s never balanced' % member) def _check_connection(self, check_ip, port=80): @@ -538,7 +537,7 @@ class BaseTestCase(manager.NetworkScenarioTest): counters = self._send_requests(self.vip_ip, ["server1", "server2"]) # Assert that no traffic is sent to server1. - for member, counter in six.iteritems(counters): + for member, counter in counters.items(): if member == 'server1': self.assertEqual(counter, 0, 'Member %s is not balanced' % member) @@ -549,7 +548,7 @@ class BaseTestCase(manager.NetworkScenarioTest): Assert that no traffic is sent to any servers """ counters = self._send_requests(self.vip_ip, ["server1", "server2"]) - for member, counter in six.iteritems(counters): + for member, counter in counters.items(): self.assertEqual(counter, 0, 'Member %s is balanced' % member) def _check_source_ip_persistence(self): diff --git a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py index 9aacf9ba4..aa13574c5 100755 --- a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py +++ b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py @@ -4119,7 +4119,7 @@ class LbaasStatusesTest(MemberTestBase): def _countDisabledChildren(self, obj, count): if isinstance(obj, dict): - for key, value in six.iteritems(obj): + for key, value in obj.items(): if key == "operating_status": count += 1 continue diff --git a/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py b/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py index c9eb99605..d88c6d7d5 100644 --- a/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py +++ b/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py @@ -20,7 +20,6 @@ from neutron.plugins.common import constants from neutron.tests.unit import testlib_api from neutron_lib.api.definitions import portbindings from oslo_utils import uuidutils -import six from six import moves from neutron_lbaas.db.loadbalancer import loadbalancer_dbv2 as ldb @@ -178,7 +177,7 @@ class TestLoadBalancerCallbacks( db_lb = self.plugin_instance.db.get_loadbalancer(ctx, lb_id) func(ctx, port_id=db_lb.vip_port_id, **kwargs) db_port = core.get_port(ctx, db_lb.vip_port_id) - for k, v in six.iteritems(expected): + for k, v in expected.items(): self.assertEqual(v, db_port[k]) def test_plug_vip_port(self): diff --git a/neutron_lbaas/tests/unit/test_agent_scheduler.py b/neutron_lbaas/tests/unit/test_agent_scheduler.py index 270a8eeb3..79b7e2091 100644 --- a/neutron_lbaas/tests/unit/test_agent_scheduler.py +++ b/neutron_lbaas/tests/unit/test_agent_scheduler.py @@ -32,7 +32,6 @@ from neutron.tests.unit.db import test_agentschedulers_db import neutron.tests.unit.extensions from neutron.tests.unit.extensions import test_agent from neutron_lib import constants as n_constants -import six from webob import exc from neutron_lbaas.drivers.haproxy import plugin_driver @@ -98,7 +97,7 @@ class LBaaSAgentSchedulerTestCase(test_agent.AgentDBTestMixIn, def setUp(self): # Save the global RESOURCE_ATTRIBUTE_MAP self.saved_attr_map = {} - for res, attrs in six.iteritems(attributes.RESOURCE_ATTRIBUTE_MAP): + for res, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.items(): self.saved_attr_map[res] = attrs.copy() service_plugins = { 'lb_plugin_name': test_db_loadbalancerv2.DB_LB_PLUGIN_CLASS}