From a9f3af85cb13cc1d6482778840ab19f8865a40a6 Mon Sep 17 00:00:00 2001 From: Harikrishna Date: Tue, 10 Oct 2023 15:49:57 +0530 Subject: [PATCH] Default value of force should be false for template delete operation (#7731) * default value of force should be false * Added force flag in tests --- .../api/command/user/template/DeleteTemplateCmd.java | 4 +++- test/integration/smoke/test_templates.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index 6923751ea77..3d7aaaec31c 100755 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/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,8 +68,9 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { } public boolean isForced() { - return (forced != null) ? forced : true; + return BooleanUtils.toBooleanDefaultIfNull(forced, false); } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index 00ad2201b44..bd5f522e440 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -115,6 +115,7 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase): 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)