Python 3: do not index dict_values objects

Change-Id: I7260468b81d42415ac08ecda09973720b5b263a4
Blueprint: neutron-python3

diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index e8e16275bae7f5496358491c237c78e37875835c..c09c5273d33a0d9a8217a6e26e4693747269fb93 100644 (file)
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -1266,7 +1266,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
         routers_dict = dict((router['id'], router) for router in routers)
         self._process_floating_ips(context, routers_dict, floating_ips)
         self._process_interfaces(routers_dict, interfaces)
-        return routers_dict.values()
+        return list(routers_dict.values())
 
 
 class L3RpcNotifierMixin(object):

diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py
index ef8c0b2fbd3d4cfa3c80e180b3adacb2c28d6eda..29350ce77857a6779555ab3a8576daaf5aa3bc65 100644 (file)
--- a/neutron/db/l3_hamode_db.py
+++ b/neutron/db/l3_hamode_db.py
@@ -470,7 +470,7 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin):
             if interface:
                 self._populate_subnets_for_ports(context, [interface])
 
-        return routers_dict.values()
+        return list(routers_dict.values())
 
     def get_ha_sync_data_for_host(self, context, host=None, router_ids=None,
                                   active=None):

diff --git a/neutron/db/metering/metering_db.py b/neutron/db/metering/metering_db.py
index 2e7f9c372fee3cc3d92a1e86aab6620736290331..227b9ad23e255c50409609b65dbd3db343e4a1f9 100644 (file)
--- a/neutron/db/metering/metering_db.py
+++ b/neutron/db/metering/metering_db.py
@@ -234,7 +234,7 @@ class MeteringDbMixin(metering.MeteringPluginBase,
 
                 routers_dict[router['id']] = router_dict
 
-        return routers_dict.values()
+        return list(routers_dict.values())
 
     def get_sync_data_for_rule(self, context, rule):
         label = context.session.query(MeteringLabel).get(
@@ -253,7 +253,7 @@ class MeteringDbMixin(metering.MeteringPluginBase,
             router_dict[constants.METERING_LABEL_KEY].append(data)
             routers_dict[router['id']] = router_dict
 
-        return routers_dict.values()
+        return list(routers_dict.values())
 
     def get_sync_data_metering(self, context, label_id=None, router_ids=None):
         labels = context.session.query(MeteringLabel)

diff --git a/neutron/db/quota_db.py b/neutron/db/quota_db.py
index ad7196675f3b1b93aab5c5b9d7f8067d2f9ff0c2..5bf1ac9d27ba2f60aa50034ae7d29242d1779bc3 100644 (file)
--- a/neutron/db/quota_db.py
+++ b/neutron/db/quota_db.py
@@ -95,7 +95,7 @@ class DbQuotaDriver(object):
 
             tenant_quota[quota['resource']] = quota['limit']
 
-        return all_tenant_quotas.values()
+        return list(all_tenant_quotas.values())
 
     @staticmethod
     def update_quota_limit(context, tenant_id, resource, limit):

diff --git a/tox.ini b/tox.ini
index 9d0a4eaed8413a8ec36fdbac0c7e5deeeada7e52..8fa87dc175d75620c2ff47cac87af1940e15a294 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -115,6 +115,7 @@ commands = python -m testtools.run \
     neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
     neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
     neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_agent_scheduler \
     neutron.tests.unit.plugins.brocade.test_brocade_db \
     neutron.tests.unit.plugins.brocade.test_brocade_vlan \
     neutron.tests.unit.plugins.oneconvergence.test_nvsd_agent \
@@ -155,11 +156,14 @@ commands = python -m testtools.run \
     neutron.tests.unit.plugins.cisco.n1kv.test_n1kv_db \
     neutron.tests.unit.plugins.cisco.n1kv.fake_client \
     neutron.tests.unit.plugins.cisco.test_network_db \
+    neutron.tests.unit.scheduler.test_l3_agent_scheduler \
     neutron.tests.unit.scheduler.test_dhcp_agent_scheduler \
     neutron.tests.unit.db.test_ipam_backend_mixin \
     neutron.tests.unit.db.test_l3_dvr_db \
+    neutron.tests.unit.db.test_l3_hamode_db \
     neutron.tests.unit.db.test_migration \
     neutron.tests.unit.db.test_agents_db \
+    neutron.tests.unit.db.test_quota_db \
     neutron.tests.unit.db.test_dvr_mac_db \
     neutron.tests.unit.debug.test_commands \
     neutron.tests.unit.tests.test_post_mortem_debug \