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
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
[sfa.git]
/
sfa
/
openstack
/
security_group.py
diff --git
a/sfa/openstack/security_group.py
b/sfa/openstack/security_group.py
index
32f86fb
..
70e191e
100644
(file)
--- a/
sfa/openstack/security_group.py
+++ b/
sfa/openstack/security_group.py
@@
-8,13
+8,15
@@
class SecurityGroup:
def create_security_group(self, name):
try:
def create_security_group(self, name):
try:
- self.client.security_groups.create(name=name, description=
""
)
+ self.client.security_groups.create(name=name, description=
name
)
except Exception, ex:
logger.log_exc("Failed to add security group")
except Exception, ex:
logger.log_exc("Failed to add security group")
+ raise
def delete_security_group(self, name):
try:
def delete_security_group(self, name):
try:
- self.client.security_groups(name=name)
+ security_group = self.client.security_groups.find(name=name)
+ self.client.security_groups.delete(security_group.id)
except Exception, ex:
logger.log_exc("Failed to delete security group")
except Exception, ex:
logger.log_exc("Failed to delete security group")
@@
-54,13
+56,8
@@
class SecurityGroup:
from_port, to_port = icmp_type[0], icmp_type[1]
group = self.client.security_groups.find(name=group_name)
from_port, to_port = icmp_type[0], icmp_type[1]
group = self.client.security_groups.find(name=group_name)
- self.client.security_group_rules.create(
- group_id=group.id,
- ip_protocol=protocol,
- from_port=from_port,
- to_port=to_port,
- cidr_ip=cidr_ip,
- )
+ self.client.security_group_rules.create(group.id, \
+ protocol, from_port, to_port,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)
@@
-78,7
+75,7
@@
class SecurityGroup:
'id': group.id,
'from_port': from_port,
'to_port': to_port,
'id': group.id,
'from_port': from_port,
'to_port': to_port,
- 'ci
rd
_ip': ip,
+ 'ci
dr
_ip': ip,
'ip_protocol':protocol,
}
rule = self.client.security_group_rules.find(**filter)
'ip_protocol':protocol,
}
rule = self.client.security_group_rules.find(**filter)