diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-06-06 15:33:35 -0400 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2011-06-06 15:33:35 -0400 |
| commit | 93f61c18134e6b4091114a7126f52d74e0d20df8 (patch) | |
| tree | b6bbb33b37e7d625db3de6b1f8d5a53bdf78365e /nova/api | |
| parent | e52069015aa3ed0ba130f529ebfb93d53ea6053c (diff) | |
Remove ipy from nova/api/ec2/cloud.py and use netaddr
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b7a9a8633..ceeaa3e48 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 @@ -444,7 +444,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' |