You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/10 13:18:30 UTC
git commit: updated refs/heads/master to a55f108
Updated Branches:
refs/heads/master 503609765 -> a55f10828
CLOUDSTACK-5405: Changed marvin to create sg in account into which vm is deployed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a55f1082
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a55f1082
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a55f1082
Branch: refs/heads/master
Commit: a55f1082856b8b20227d04ec41a844b99ff9ccb6
Parents: 5036097
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Tue Dec 10 00:27:49 2013 -0500
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Tue Dec 10 00:27:49 2013 -0500
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a55f1082/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 86f962a..b43af33 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -246,13 +246,17 @@ class VirtualMachine:
if zone.securitygroupsenabled:
list_security_groups = SecurityGroup.list(
apiclient,
+ account=cmd.account,
+ domainid=cmd.domainid,
securitygroupname="basic_sec_grp"
)
if not isinstance(list_security_groups, list):
basic_mode_security_group = SecurityGroup.create(
apiclient,
- {"name": "basic_sec_grp"}
+ {"name": "basic_sec_grp"},
+ cmd.account,
+ cmd.domainid,
)
sec_grp_services = {
"protocol": "TCP",