Merge "Use only the lower 16 bits of iptables mark for marking"

diff --cc neutron/agent/l3/router_info.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
index 2ad0a56eef44cf6d8bda173f24ed698b09149cc3,0de6becd9e6a8deb446417eca7e27a153358c161..049152eae914d92f291829541365b623e9030c39
--- 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
@@@ -1540,9 -1542,10 +1543,10 @@@ class TestBasicRouterOperations(BasicRo
          self.assertThat(nat_rules.index(jump_float_rule),
                          matchers.LessThan(nat_rules.index(snat_rule1)))
  
 -        mangle_rules = map(str, ri.iptables_manager.ipv4['mangle'].rules)
 +        mangle_rules = list(map(str, ri.iptables_manager.ipv4['mangle'].rules))
          mangle_rule = ("-A %s-mark -i iface "
-                        "-j MARK --set-xmark 0x2/0xffffffff") % wrap_name
+                        "-j MARK --set-xmark 0x2/%s" %
+                        (wrap_name, l3_constants.ROUTER_MARK_MASK))
          self.assertIn(mangle_rule, mangle_rules)
  
      def test_process_router_delete_stale_internal_devices(self):