[13/50] git commit: updated refs/heads/ldapplugin to 1f64354

[ap...@apache.org]

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 <ts...@apache.org>
(cherry picked from commit 4a7f5d59d6f77fdeb5623937f4efa2542f891573)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8a38ca7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8a38ca7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8a38ca7

Branch: refs/heads/ldapplugin
Commit: b8a38ca7bd866db32dba644f8fc1be5d3406e16c
Parents: 2b8f1bd
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jul 24 16:13:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:53: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/b8a38ca7/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)