Merge "Add index generation for IPv6 rules for DVR"

diff --cc neutron/agent/l3/dvr.py
index f55293c00f7c2f9c4f5f32f867b31cf18f20f938,2e1f49e3676bb2c74d783513307e436fc739b228..cb72666e9d1175608b208db32a667b56a9bead54
--- 1/neutron/agent/l3/dvr.py
--- 2/neutron/agent/l3/dvr.py
+++ b/neutron/agent/l3/dvr.py
@@@ -36,8 -37,22 +37,10 @@@ FIP_PR_START = 3276
  FIP_PR_END = FIP_PR_START + 40000
  # Route Table index for FIPs
  FIP_RT_TBL = 16
+ # xor-folding mask used for IPv6 rule index
+ MASK_30 = 0x3fffffff
  
  
 -class RouterMixin(object):
 -    def __init__(self):
 -        self.snat_ports = []
 -        self.floating_ips_dict = {}
 -
 -        self.snat_iptables_manager = None
 -        # DVR Data
 -        # Linklocal subnet for router and floating IP namespace link
 -        self.rtr_fip_subnet = None
 -        self.dist_fip_count = 0
 -
 -
  class AgentMixin(object):
      def __init__(self, host):
          # dvr data

diff --cc neutron/tests/unit/test_l3_agent.py
Simple merge