From d5316d0572df0843a5decb69c0385fc5fcf192b0 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Wed, 8 Oct 2014 16:08:44 +0530 Subject: [PATCH] CLOUDSTACK-7685: Fixed copy template method call in test_escalations_template.py. Removed unbound method of the same name as bound method from base library and changed method call accordingly Signed-off-by: SrikanteswaraRao Talluri --- .../component/test_escalations_templates.py | 3 +-- tools/marvin/marvin/lib/base.py | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/test/integration/component/test_escalations_templates.py b/test/integration/component/test_escalations_templates.py index 78028bc2f10..3dc24c1e7ba 100644 --- a/test/integration/component/test_escalations_templates.py +++ b/test/integration/component/test_escalations_templates.py @@ -839,9 +839,8 @@ class TestTemplates(cloudstackTestCase): count = count + 1 # Copying the Template from Zone1 to Zone2 - copied_template = Template.copy( + copied_template = template_created.copy( self.userapiclient, - template_created.id, sourcezoneid=template_created.zoneid, destzoneid=zones_list[1].id ) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 77faeeb233f..cedb95bb3dd 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -1257,17 +1257,6 @@ class Template: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.updateTemplate(cmd)) - @classmethod - def copy(cls, apiclient, id, sourcezoneid, destzoneid): - "Copy Template from source Zone to Destination Zone" - - cmd = copyTemplate.copyTemplateCmd() - cmd.id = id - cmd.sourcezoneid = sourcezoneid - cmd.destzoneid = destzoneid - - return apiclient.copyTemplate(cmd) - def copy(self, apiclient, sourcezoneid, destzoneid): "Copy Template from source Zone to Destination Zone"