You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/01 10:36:41 UTC
git commit: updated refs/heads/4.4 to 62b210b
Repository: cloudstack
Updated Branches:
refs/heads/4.4 ce56894d3 -> 62b210b58
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/62b210b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62b210b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62b210b5
Branch: refs/heads/4.4
Commit: 62b210b58369a6f81ef1e40e81fee068c2deb6a9
Parents: ce56894
Author: Min Chen <mi...@citrix.com>
Authored: Wed Apr 30 10:20:12 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 1 10:28:09 2014 +0200
----------------------------------------------------------------------
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/62b210b5/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 91e277c..95b7fe9 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -3735,15 +3735,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"""
@@ -3751,24 +3751,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)
@@ -3796,7 +3796,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"""
@@ -3807,7 +3807,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"""
@@ -3818,16 +3818,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()