Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F20EC10DC1 for ; Fri, 12 Jul 2013 04:50:03 +0000 (UTC) Received: (qmail 87954 invoked by uid 500); 12 Jul 2013 04:50:03 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 87763 invoked by uid 500); 12 Jul 2013 04:49:59 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 87756 invoked by uid 99); 12 Jul 2013 04:49:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jul 2013 04:49:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9021E8948FC; Fri, 12 Jul 2013 04:49:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Message-Id: <3d63f62f0bdb424c942c1c20841c3604@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to e69ebab Date: Fri, 12 Jul 2013 04:49:58 +0000 (UTC) Updated Branches: refs/heads/4.2 52d3e1190 -> e69ebab34 include account and domainid in affinity group creation Signed-off-by: Prasanna Santhanam (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/e69ebab3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e69ebab3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e69ebab3 Branch: refs/heads/4.2 Commit: e69ebab34e7ecf79e5bc2006696891ed7ba32d25 Parents: 52d3e11 Author: Prasanna Santhanam Authored: Tue Jul 2 17:02:00 2013 +0530 Committer: Prasanna Santhanam Committed: Fri Jul 12 10:19:44 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/e69ebab3/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):