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 <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1e7feea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1e7feea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1e7feea Branch: refs/heads/4.5 Commit: a1e7feead91b22350f96114add4bf8d75a74b8b1 Parents: b1ab888 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Wed Oct 8 16:08:44 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Thu Oct 30 15:15:52 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_escalations_templates.py | 3 +-- tools/marvin/marvin/lib/base.py | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e7feea/test/integration/component/test_escalations_templates.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_escalations_templates.py b/test/integration/component/test_escalations_templates.py index 78028bc..3dc24c1 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 ) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e7feea/tools/marvin/marvin/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 7f53328..580d0ab 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -1255,17 +1255,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"
