From 7a2712ebf74e5565663a6723a992151f71255eff Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Tue, 14 Jun 2011 11:34:03 -0700
Subject: Move ipy commands to netaddr.

---
 nova/api/ec2/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index fcf7f674c..343bc61c4 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -22,7 +22,7 @@ Admin API controller, exposed through http via the api worker.
 
 import base64
 import datetime
-import IPy
+import netaddr
 import urllib
 
 from nova import compute
@@ -346,7 +346,7 @@ class AdminController(object):
                   cidr, context=context)
         cidr = urllib.unquote(cidr).decode()
         # raise if invalid
-        IPy.IP(cidr)
+        netaddr.IPNetwork(cidr)
         rule = {'cidr': cidr}
         tcp_rule = rule.copy()
         tcp_rule.update({'protocol': 'tcp', 'from_port': 1, 'to_port': 65535})
-- 
cgit