From 4a1018e23b0ea80ba8b7cdb80a5efebdb50afea1 Mon Sep 17 00:00:00 2001 From: Prashant Kumar Mishra Date: Tue, 7 Oct 2014 15:45:48 +0530 Subject: [PATCH] CLOUDSTACK-7680:Adding kwargs to volume.upload in base.py Signed-off-by: SrikanteswaraRao Talluri --- tools/marvin/marvin/lib/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index d6233862fd3..77faeeb233f 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):