cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [23/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:41:40 GMT
CLOUDSTACK-7680:Adding kwargs to volume.upload in base.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 4a1018e23b0ea80ba8b7cdb80a5efebdb50afea1)


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

Branch: refs/heads/4.5
Commit: 0e2e1df3aa50f728168db415c887c5897762daec
Parents: 9605f57
Author: Prashant Kumar Mishra <prashantkumar.mishra@citrix.com>
Authored: Tue Oct 7 15:45:48 2014 +0530
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:31:39 2014 -0400

----------------------------------------------------------------------
 tools/marvin/marvin/lib/base.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e2e1df3/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):


Mime
View raw message