git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
54e6a47
)
Dont try to validate ip or protocol here. Assume that will be handled by the ec2 api
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 15 Mar 2012 21:07:29 +0000
(17:07 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 15 Mar 2012 21:07:29 +0000
(17:07 -0400)
sfa/openstack/security_group.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/security_group.py
b/sfa/openstack/security_group.py
index
63f8676
..
e669e42
100644
(file)
--- a/
sfa/openstack/security_group.py
+++ b/
sfa/openstack/security_group.py
@@
-9,14
+9,14
@@
class SecurityGroup:
def create_security_group(self, name):
conn = self.driver.euca_shell.get_euca_connection()
try:
def create_security_group(self, name):
conn = self.driver.euca_shell.get_euca_connection()
try:
- conn.create_security_group(name=
group_
name)
+ conn.create_security_group(name=
name, description=
name)
except Exception, ex:
logger.log_exc("Failed to add security group")
def delete_security_group(self, name):
conn = self.driver.euca_shell.get_euca_connection()
try:
except Exception, ex:
logger.log_exc("Failed to add security group")
def delete_security_group(self, name):
conn = self.driver.euca_shell.get_euca_connection()
try:
- conn.delete_security_group(name=
group_
name)
+ conn.delete_security_group(name=name)
except Exception, ex:
logger.log_exc("Failed to delete security group")
except Exception, ex:
logger.log_exc("Failed to delete security group")
@@
-51,17
+51,12
@@
class SecurityGroup:
port_range=None, icmp_type_code=None,
source_group_name=None, source_group_owner_id=None):
port_range=None, icmp_type_code=None,
source_group_name=None, source_group_owner_id=None):
-
from_port, to_port = self._validate_port_range(port_range)
icmp_type = self._validate_icmp_type_code(icmp_type_code)
if icmp_type:
from_port, to_port = icmp_type[0], icmp_type[1]
if group_name:
from_port, to_port = self._validate_port_range(port_range)
icmp_type = self._validate_icmp_type_code(icmp_type_code)
if icmp_type:
from_port, to_port = icmp_type[0], icmp_type[1]
if group_name:
- if cidr_ip:
- self.driver.euca_shell.euca2ool.validate_address(cidr_ip)
- if protocol:
- self.driver.euca_shell.euca2ool.validate_protocol(protocol)
conn = self.driver.euca_shell.get_euca_connection()
try:
conn.authorize_security_group(
conn = self.driver.euca_shell.get_euca_connection()
try:
conn.authorize_security_group(
@@
-71,7
+66,7
@@
class SecurityGroup:
ip_protocol=protocol,
from_port=from_port,
to_port=to_port,
ip_protocol=protocol,
from_port=from_port,
to_port=to_port,
- cidr_ip=ip,
+ cidr_ip=
cidr_
ip,
)
except Exception, ex:
logger.log_exc("Failed to add rule to group %s" % group_name)
)
except Exception, ex:
logger.log_exc("Failed to add rule to group %s" % group_name)
@@
-87,10
+82,6
@@
class SecurityGroup:
from_port, to_port = icmp_type[0], icmp_type[1]
if group_name:
from_port, to_port = icmp_type[0], icmp_type[1]
if group_name:
- if cidr_ip:
- self.driver.euca_shell.euca2ool.validate_address(cidr_ip)
- if protocol:
- self.driver.euca_shell.euca2ool.validate_protocol(protocol)
conn = self.driver.euca_shell.get_euca_connection()
try:
conn.revoke_security_group(
conn = self.driver.euca_shell.get_euca_connection()
try:
conn.revoke_security_group(