etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <talluri@apache.org>
This commit is contained in:
Gaurav Aradhye 2014-10-08 16:08:44 +05:30 committed by SrikanteswaraRao Talluri
parent 6d7666b135
commit d5316d0572
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/component/test_escalations_templates.py
View File

@ -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
)

11
tools/marvin/marvin/lib/base.py
View File

@ -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"