cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [08/11] git commit: updated refs/heads/master to 8b636bd
Date Tue, 04 Nov 2014 06:31:24 GMT
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>


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

Branch: refs/heads/master
Commit: d5316d0572df0843a5decb69c0385fc5fcf192b0
Parents: 6d7666b
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed Oct 8 16:08:44 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Tue Nov 4 11:55: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/d5316d05/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/d5316d05/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 77faeeb..cedb95b 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"
 


Mime
View raw message