template: Ensuring template is cross zone if type changed to system (#4522)

davidjumani · web-flow · commit 2f78b8867fe4 · 2020-12-14T08:59:40.000Z
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -2108,6 +2108,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
             if (templateType != null && cmd.isRoutingType() != null && (TemplateType.ROUTING.equals(templateType) != cmd.isRoutingType())) {
                 throw new InvalidParameterValueException("Please specify a valid templatetype (consistent with isrouting parameter).");
             }
+            if (templateType != null && (templateType == TemplateType.SYSTEM || templateType == TemplateType.BUILTIN) && !template.isCrossZones()) {
+                throw new InvalidParameterValueException("System and Builtin templates must be cross zone");
+            }
         }
 
         // update is needed if any of the fields below got filled by the user

Original file line number	Diff line number	Diff line change
`@@ -2108,6 +2108,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {`
`2108`	`2108`	`if (templateType != null && cmd.isRoutingType() != null && (TemplateType.ROUTING.equals(templateType) != cmd.isRoutingType())) {`
`2109`	`2109`	`throw new InvalidParameterValueException("Please specify a valid templatetype (consistent with isrouting parameter).");`
`2110`	`2110`	`}`
	`2111`	`+ if (templateType != null && (templateType == TemplateType.SYSTEM \|\| templateType == TemplateType.BUILTIN) && !template.isCrossZones()) {`
	`2112`	`+ throw new InvalidParameterValueException("System and Builtin templates must be cross zone");`
	`2113`	`+ }`
`2111`	`2114`	`}`
`2112`	`2115`
`2113`	`2116`	`// update is needed if any of the fields below got filled by the user`