From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 23 May 2012 16:19:48 +0000 (-0400)
Subject: dont use icmp_type if values are None
X-Git-Tag: sfa-2.1-8~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e0579aef839ee7bdd4cf13134eb468163cbc8437;p=sfa.git

dont use icmp_type if values are None
---

diff --git a/sfa/openstack/security_group.py b/sfa/openstack/security_group.py
index 33c62743..99f07f03 100644
--- a/sfa/openstack/security_group.py
+++ b/sfa/openstack/security_group.py
@@ -30,8 +30,6 @@ class SecurityGroup:
                 to_port = int(ports[1])
             else:
                 from_port = to_port = int(ports[0])
-        else:
-            from_port = to_port = None
         return (from_port, to_port)
 
     def _validate_icmp_type_code(self, icmp_type_code):
@@ -53,7 +51,7 @@ class SecurityGroup:
 
         from_port, to_port = self._validate_port_range(port_range)
         icmp_type = self._validate_icmp_type_code(icmp_type_code)
-        if icmp_type:
+        if icmp_type and icmp_type[0] and icmp_type[1]:
             from_port, to_port = icmp_type[0], icmp_type[1]
 
         if group_name: