You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/10/07 12:46:55 UTC
git commit: updated refs/heads/master to 4a1018e
Repository: cloudstack
Updated Branches:
refs/heads/master ff797dfa5 -> 4a1018e23
CLOUDSTACK-7680:Adding kwargs to volume.upload in base.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a1018e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a1018e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a1018e2
Branch: refs/heads/master
Commit: 4a1018e23b0ea80ba8b7cdb80a5efebdb50afea1
Parents: ff797df
Author: Prashant Kumar Mishra <pr...@citrix.com>
Authored: Tue Oct 7 15:45:48 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Oct 7 16:15:51 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/lib/base.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a1018e2/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index d623386..77faeeb 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -894,7 +894,7 @@ class Volume:
@classmethod
def upload(cls, apiclient, services, zoneid=None,
- account=None, domainid=None, url=None):
+ account=None, domainid=None, url=None, **kwargs):
"""Uploads the volume to specified account"""
cmd = uploadVolume.uploadVolumeCmd()
@@ -910,6 +910,7 @@ class Volume:
cmd.url = url
else:
cmd.url = services["url"]
+ [setattr(cmd, k, v) for k, v in kwargs.items()]
return Volume(apiclient.uploadVolume(cmd).__dict__)
def wait_for_upload(self, apiclient, timeout=10, interval=60):