summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-06-25 01:54:28 +0000
committerTarmac <>2011-06-25 01:54:28 +0000
commit543a57a3d0215089310b2094b0267bd762e2bc00 (patch)
tree4e634565ab3604b36238631be1bb6225ee8cdc10 /nova/api
parent1b08d1b3a505788a52e709bf762e679ce8cc9077 (diff)
parentc2a0f15457ec49e95de0a2e7cd6c8b60e81a4994 (diff)
Removes the usage of the IPy module in favor of the netaddr module.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 97875f1f5..9aaf37a2d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -23,7 +23,7 @@ datastore.
"""
import base64
-import IPy
+import netaddr
import os
import urllib
import tempfile
@@ -452,7 +452,7 @@ class CloudController(object):
elif cidr_ip:
# If this fails, it throws an exception. This is what we want.
cidr_ip = urllib.unquote(cidr_ip).decode()
- IPy.IP(cidr_ip)
+ netaddr.IPNetwork(cidr_ip)
values['cidr'] = cidr_ip
else:
values['cidr'] = '0.0.0.0/0'