]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Only create one netaddr.IPNetwork object
authorAaron Rosen <aaronorosen@gmail.com>
Wed, 24 Jun 2015 17:28:18 +0000 (10:28 -0700)
committerAaron Rosen <aaronorosen@gmail.com>
Wed, 24 Jun 2015 17:29:58 +0000 (10:29 -0700)
Change-Id: I8c6a08e0cf3b5b5386fe03af9f2174c663b8ac73

neutron/agent/linux/ipset_manager.py

index d76304f2f503175fbef4667f0a42f0166e336f19..ebcc72dc1c246167a978a4a53f5e08e090616b7c 100644 (file)
@@ -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