Repository: cloudstack Updated Branches: refs/heads/4.4-forward 412793f9b -> 42b803dd4
CLOUDSTACK-6502:Remove trailing whitespaces. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/42b803dd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42b803dd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42b803dd Branch: refs/heads/4.4-forward Commit: 42b803dd4b6e01107cbcf08d87f17c47934e8ae7 Parents: 412793f Author: Min Chen <min.c...@citrix.com> Authored: Wed Apr 30 10:20:12 2014 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Wed Apr 30 10:20:12 2014 -0700 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42b803dd/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 37fdb14..b0f7f8c 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -3741,15 +3741,15 @@ class IAMGroup: def list(cls, apiclient, **kwargs): cmd = listIAMGroups.listIAMGroupsCmd() [setattr(cmd, k, v) for k, v in kwargs.items()] - return apiclient.listIAMGroups(cmd) - + return apiclient.listIAMGroups(cmd) + def addAccount(self, apiclient, accts): """Add accounts to iam group""" cmd = addAccountToIAMGroup.addAccountToIAMGroupCmd() cmd.id = self.id cmd.accounts = [str(acct.id) for acct in accts] apiclient.addAccountToIAMGroup(cmd) - return + return def removeAccount(self, apiclient, accts): """ Remove accounts from iam group""" @@ -3757,24 +3757,24 @@ class IAMGroup: cmd.id = self.id cmd.accounts = [str(acct.id) for acct in accts] apiclient.removeAccountFromIAMGroup(cmd) - return - + return + def attachPolicy(self, apiclient, policies): """Add policies to iam group""" cmd = attachIAMPolicyToIAMGroup.attachIAMPolicyToIAMGroupCmd() cmd.id = self.id cmd.policies = [str(policy.id) for policy in policies] apiclient.attachIAMPolicyToIAMGroup(cmd) - return - + return + def detachPolicy(self, apiclient, policies): """Remove policies from iam group""" cmd = removeIAMPolicyFromIAMGroup.removeIAMPolicyFromIAMGroupCmd() cmd.id = self.id cmd.policies = [str(policy.id) for policy in policies] apiclient.removeIAMPolicyFromIAMGroup(cmd) - return - + return + class IAMPolicy: def __init__(self, items): self.__dict__.update(items) @@ -3802,7 +3802,7 @@ class IAMPolicy: def list(cls, apiclient, **kwargs): cmd = listIAMPolicies.listIAMPoliciesCmd() [setattr(cmd, k, v) for k, v in kwargs.items()] - return apiclient.listIAMPolicies(cmd) + return apiclient.listIAMPolicies(cmd) def addPermission(self, apiclient, permission): """Add permission to iam policy""" @@ -3813,7 +3813,7 @@ class IAMPolicy: cmd.scope = permission['scope'] cmd.scopeid = permission['scopeid'] apiclient.addIAMPermissionToIAMPolicy(cmd) - return + return def removePermission(self, apiclient, permission): """Remove permission from iam policy""" @@ -3824,16 +3824,16 @@ class IAMPolicy: cmd.scope = permission['scope'] cmd.scopeid = permission['scopeid'] apiclient.removeIAMPermissionFromIAMPolicy(cmd) - return - + return + def attachAccount(self, apiclient, accts): """Attach iam policy to accounts""" cmd = attachIAMPolicyToAccount.attachIAMPolicyToAccountCmd() cmd.id = self.id cmd.accounts = [str(acct.id) for acct in accts] apiclient.attachIAMPolicyToAccount(cmd) - return - + return + def detachAccount(self, apiclient, accts): """Detach iam policy from accounts""" cmd = removeIAMPolicyFromAccount.removeIAMPolicyFromAccountCmd()
