You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/20 08:58:52 UTC
git commit: updated refs/heads/master to 4f8c43f
Updated Branches:
refs/heads/master ecfeaa103 -> 4f8c43fc2
CLOUDSTACK:3452: Check if security groups feature is enabled in basic zone before creating security group while creating VM
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 3c360ce02807240586d471ab4c0cbd24d76ed7e6)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f8c43fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f8c43fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f8c43fc
Branch: refs/heads/master
Commit: 4f8c43fc2089e455aaad8203c01d44ed409d0c32
Parents: ecfeaa1
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Jul 19 02:16:16 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 20 12:28:35 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 61 ++++++++++++++----------
1 file changed, 36 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f8c43fc/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 03c0707..0938333 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -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)
-
- 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]
+ #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]
+
+ 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"]