Updated Branches: refs/heads/4.2 722266378 -> 8e30ee3f1
CLOUDSTACK-3594: Fix regression in Affinity Groups tests One of the patches introduced a regression where account and domainid parameters were changed. Therefore Affinity Groups for those accounts were not found and tests failed. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a7f5d59 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a7f5d59 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a7f5d59 Branch: refs/heads/4.2 Commit: 4a7f5d59d6f77fdeb5623937f4efa2542f891573 Parents: 74ac857 Author: Girish Shilamkar <[email protected]> Authored: Wed Jul 24 16:13:35 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jul 24 16:52:45 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a7f5d59/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 6e49ae5..0f6fdc5 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -3020,9 +3020,9 @@ class AffinityGroup: if name is not None: cmd.name = name if account is not None: - cmd.accountname = account + cmd.account = account if domainid is not None: - cmd.domaindid = domainid + cmd.domainid = domainid return apiclient.deleteAffinityGroup(cmd)
