From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 15 Mar 2012 19:44:22 +0000 (-0400)
Subject: use euca2ool to validate protocol and ip addresses
X-Git-Tag: sfa-2.1-4~30
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0dc62ed53820a645f6c1cf752bbcdba0badebc82;p=sfa.git

use euca2ool to validate protocol and ip addresses
---

diff --git a/sfa/openstack/security_group.py b/sfa/openstack/security_group.py
index f7233129..63f86767 100644
--- a/sfa/openstack/security_group.py
+++ b/sfa/openstack/security_group.py
@@ -59,9 +59,9 @@ class SecurityGroup:
 
         if group_name:
             if cidr_ip:
-                euca.validate_address(cidr_ip)
+                self.driver.euca_shell.euca2ool.validate_address(cidr_ip)
             if protocol:
-               euca.validate_protocol(protocol)
+               self.driver.euca_shell.euca2ool.validate_protocol(protocol)
             conn = self.driver.euca_shell.get_euca_connection()
             try:
                 conn.authorize_security_group(
@@ -88,9 +88,9 @@ class SecurityGroup:
 
         if group_name:
             if cidr_ip:
-                euca.validate_address(cidr_ip)
+                self.driver.euca_shell.euca2ool.validate_address(cidr_ip)
             if protocol:
-               euca.validate_protocol(protocol)
+               self.driver.euca_shell.euca2ool.validate_protocol(protocol)
             conn = self.driver.euca_shell.get_euca_connection()
             try:
                 conn.revoke_security_group(