From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Jan 2015 16:30:52 +0000 (+0000)
Subject: Merge "Add index generation for IPv6 rules for DVR"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b380b419f0674bc8cb02953112367f83834c0175;p=openstack-build%2Fneutron-build.git

Merge "Add index generation for IPv6 rules for DVR"
---

b380b419f0674bc8cb02953112367f83834c0175
diff --cc neutron/agent/l3/dvr.py
index f55293c00,2e1f49e36..cb72666e9
--- a/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