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/11 09:25:40 UTC

git commit: updated refs/heads/4.3 to c2a62c3

Updated Branches:
  refs/heads/4.3 669d4322a -> c2a62c3a1


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/c2a62c3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2a62c3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2a62c3a

Branch: refs/heads/4.3
Commit: c2a62c3a10dcbae3f5cb108b7280599c728e9c70
Parents: 669d432
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Tue Dec 10 00:27:49 2013 -0500
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Dec 11 13:55:31 2013 +0530

----------------------------------------------------------------------
 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/c2a62c3a/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",