From: Aaron Rosen <aaronorosen@gmail.com>
Date: Wed, 24 Jun 2015 17:28:18 +0000 (-0700)
Subject: Only create one netaddr.IPNetwork object
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1a480203b2531925d7520b62c94954064a26139d;p=openstack-build%2Fneutron-build.git

Only create one netaddr.IPNetwork object

Change-Id: I8c6a08e0cf3b5b5386fe03af9f2174c663b8ac73
---

diff --git a/neutron/agent/linux/ipset_manager.py b/neutron/agent/linux/ipset_manager.py
index d76304f2f..ebcc72dc1 100644
--- a/neutron/agent/linux/ipset_manager.py
+++ b/neutron/agent/linux/ipset_manager.py
@@ -45,15 +45,16 @@ class IpsetManager(object):
         """
         sanitized_addresses = []
         for ip in addresses:
-            if (netaddr.IPNetwork(ip).prefixlen == 0):
-                if(netaddr.IPNetwork(ip).version == 4):
+            ip = netaddr.IPNetwork(ip)
+            if (ip.prefixlen == 0):
+                if(ip.version == 4):
                     sanitized_addresses.append('0.0.0.0/1')
                     sanitized_addresses.append('128.0.0.0/1')
-                elif (netaddr.IPNetwork(ip).version == 6):
+                elif (ip.version == 6):
                     sanitized_addresses.append('::/1')
                     sanitized_addresses.append('8000::/1')
             else:
-                sanitized_addresses.append(ip)
+                sanitized_addresses.append(str(ip))
         return sanitized_addresses
 
     @staticmethod