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/08 08:26:04 UTC
git commit: updated refs/heads/master-6-17-stable to 6d9782b
Updated Branches:
refs/heads/master-6-17-stable 10d9e5965 -> 6d9782b51
include account and domainid in affinity group creation
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 02f207f6c9645aebcc8028deb2454f03cd90d31a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d9782b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d9782b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d9782b5
Branch: refs/heads/master-6-17-stable
Commit: 6d9782b513d30aa539f28d0b791a3c19700f8968
Parents: 10d9e59
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jul 2 17:02:00 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 8 11:55:40 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d9782b5/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 710d9a9..bc8c603 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -2970,10 +2970,10 @@ class AffinityGroup:
cmd.name = aff_grp['name']
cmd.displayText = aff_grp['name']
cmd.type = aff_grp['type']
- #if account is not None:
- # cmd.account = account
- #if domainid is not None:
- # cmd.domainid = domainid
+ if account:
+ cmd.account = account
+ if domainid:
+ cmd.domainid = domainid
return AffinityGroup(apiclient.createAffinityGroup(cmd).__dict__)
def update(self, apiclient):