Merge "Python 3: Wrap map() in a list call"

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
index 7e07022a35fa0e29a047852f01c0c75a3085d2c7,159b2a11c82829120824d8eed225b52298be4cb9..2ad0a56eef44cf6d8bda173f24ed698b09149cc3
--- 1/neutron/tests/unit/agent/l3/test_agent.py
--- 2/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@@ -1519,9 -1518,9 +1519,9 @@@ class TestBasicRouterOperations(BasicRo
          ri = l3router.RouterInfo(_uuid(), {}, **self.ri_kwargs)
          ex_gw_port = {'fixed_ips': [{'ip_address': '192.168.1.4'}]}
          ri.router = {'distributed': False}
 -        ri._handle_router_snat_rules(ex_gw_port, "iface", "add_rules")
 +        ri._handle_router_snat_rules(ex_gw_port, "iface")
  
-         nat_rules = map(str, ri.iptables_manager.ipv4['nat'].rules)
+         nat_rules = list(map(str, ri.iptables_manager.ipv4['nat'].rules))
          wrap_name = ri.iptables_manager.wrap_name
  
          jump_float_rule = "-A %s-snat -j %s-float-snat" % (wrap_name,