git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added lease support in slabv1 for listing leases using
[sfa.git]
/
sfa
/
openstack
/
security_group.py
diff --git
a/sfa/openstack/security_group.py
b/sfa/openstack/security_group.py
index
f723312
..
4af0e58
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=""
)
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")
@@
-24,14
+24,12
@@
class SecurityGroup:
def _validate_port_range(self, port_range):
from_port = to_port = None
if isinstance(port_range, str):
def _validate_port_range(self, port_range):
from_port = to_port = None
if isinstance(port_range, str):
- ports = port_range.split('
-
')
+ ports = port_range.split('
:
')
if len(ports) > 1:
from_port = int(ports[0])
to_port = int(ports[1])
else:
from_port = to_port = int(ports[0])
if len(ports) > 1:
from_port = int(ports[0])
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):
return (from_port, to_port)
def _validate_icmp_type_code(self, icmp_type_code):
@@
-51,17
+49,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)
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:
from_port, to_port = icmp_type[0], icmp_type[1]
if group_name:
- if cidr_ip:
- euca.validate_address(cidr_ip)
- if protocol:
- euca.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
+64,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
+80,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:
- euca.validate_address(cidr_ip)
- if protocol:
- euca.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(