From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 22 Jul 2015 22:48:53 +0000 (+0000)
Subject: Merge "Use only the lower 16 bits of iptables mark for marking"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8836d8f6ffbf7692491eef2026842585eba1e478;p=openstack-build%2Fneutron-build.git

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

8836d8f6ffbf7692491eef2026842585eba1e478
diff --cc neutron/tests/unit/agent/l3/test_agent.py
index 2ad0a56ee,0de6becd9..049152eae
--- a/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):