etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK:3452: Check if security groups feature is enabled in basic zone before creating security group while creating VM 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3c360ce028)
This commit is contained in:
Gaurav Aradhye 2013-07-19 02:16:16 -04:00 committed by Prasanna Santhanam
parent ecfeaa1037
commit 4f8c43fc20
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tools/marvin/marvin/integration/lib/base.py
View File

@ -294,40 +294,51 @@ class VirtualMachine:
cmd.securitygroupids = [str(sg_id) for sg_id in securitygroupids]
if mode.lower() == 'basic':
list_security_groups = SecurityGroup.list(
apiclient,
securitygroupname="basic_sec_grp"
)
if not isinstance(list_security_groups, list):
basic_mode_security_group = SecurityGroup.create(
zone_list = Zone.list(
apiclient,
id = cmd.zoneid if cmd.zoneid else None,
domainid = cmd.domainid if cmd.domainid else None
)
zone = zone_list[0]
#check if security groups settings is enabled for the zone
if zone.securitygroupsenabled:
list_security_groups = SecurityGroup.list(
apiclient,
securitygroupname="basic_sec_grp"
)
if not isinstance(list_security_groups, list):
basic_mode_security_group = SecurityGroup.create(
apiclient,
{"name":"basic_sec_grp"}
)
sec_grp_services = {"protocol": "TCP",
sec_grp_services = {"protocol": "TCP",
"startport": 22,
"endport":22,
"cidrlist": "0.0.0.0/0"
}
#Authorize security group for above ingress rule
cmd_auth = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressCmd()
cmd_auth.domainid = cmd.domainid
cmd_auth.account = cmd.account
cmd_auth.securitygroupid = basic_mode_security_group.id
cmd_auth.protocol = sec_grp_services["protocol"]
cmd_auth.startport = sec_grp_services["startport"]
cmd_auth.endport = sec_grp_services["endport"]
cmd_auth.cidrlist = sec_grp_services["cidrlist"]
apiclient.authorizeSecurityGroupIngress(cmd_auth)
#Authorize security group for above ingress rule
cmd_auth = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressCmd()
cmd_auth.domainid = cmd.domainid
cmd_auth.account = cmd.account
cmd_auth.securitygroupid = basic_mode_security_group.id
cmd_auth.protocol = sec_grp_services["protocol"]
cmd_auth.startport = sec_grp_services["startport"]
cmd_auth.endport = sec_grp_services["endport"]
cmd_auth.cidrlist = sec_grp_services["cidrlist"]
apiclient.authorizeSecurityGroupIngress(cmd_auth)
else:
basic_mode_security_group = list_security_groups[0]
else:
basic_mode_security_group = list_security_groups[0]
if isinstance(cmd.securitygroupids, list):
cmd.securitygroupids.append(basic_mode_security_group.id)
else:
cmd.securitygroupids = [basic_mode_security_group.id]
if isinstance(cmd.securitygroupids, list):
cmd.securitygroupids.append(basic_mode_security_group.id)
else:
cmd.securitygroupids = [basic_mode_security_group.id]
if "affinitygroupnames" in services:
cmd.affinitygroupnames = services["affinitygroupnames"]