Merge branch 'issue-1180' into '4.18.0.0-scclouds'

Realização do _backport_ da nova mudança na API `deleteTemplate`

Closes apache#1180

See merge request scclouds/scclouds!754

Author: SadiJr

api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -67,7 +68,7 @@ public Long getZoneId() {
     }
 
     public boolean isForced() {
-        return (forced != null) ? forced : true;
+        return BooleanUtils.toBooleanDefaultIfNull(forced, false);
     }
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////

test/integration/component/test_templates.py

@@ -123,12 +123,16 @@ def setUp(self):
 
     def tearDown(self):
         try:
-            # Clean up, terminate the created templates
-            cleanup_resources(self.apiclient, self.cleanup)
-
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+                    # Clean up the created templates
+                    for temp in self.cleanup:
+                        cmd = deleteTemplate.deleteTemplateCmd()
+                        cmd.id = temp.id
+                        cmd.zoneid = self.zone.id
+                        cmd.forced = True
+                        self.apiclient.deleteTemplate(cmd)
+                except Exception as e:
+                    raise Exception("Warning: Exception during cleanup : %s" % e)
+                return
 
     @classmethod
     def setUpClass(cls):