api,server,ui: granular resource limit management

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

@@ -16,8 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -28,6 +26,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.user.UserCmd;
 import org.apache.cloudstack.api.response.TemplateResponse;
+import org.apache.log4j.Logger;
 
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
@@ -46,6 +45,9 @@ public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd implements Use
             description = "the type of the template. Valid options are: USER/VNF (for all users) and SYSTEM/ROUTING/BUILTIN (for admins only).")
     private String templateType;
 
+    @Parameter(name = ApiConstants.TEMPLATE_TAG, type = CommandType.STRING, description = "the tag for this template.", since = "4.20.0")
+    private String templateTag;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -59,6 +61,10 @@ public String getTemplateType() {
         return templateType;
     }
 
+    public String getTemplateTag() {
+        return templateTag;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java

@@ -0,0 +1,33 @@
+package org.apache.cloudstack.api.command.user.template;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.storage.Storage;
+
+@RunWith(MockitoJUnitRunner.class)
+public class UpdateTemplateCmdTest {
+
+    @Test
+    public void testGetTemplateType() {
+        UpdateTemplateCmd cmd = new UpdateTemplateCmd();
+        ReflectionTestUtils.setField(cmd, "templateType", null);
+        Assert.assertNull(cmd.getTemplateType());
+        String type = Storage.TemplateType.ROUTING.toString();
+        ReflectionTestUtils.setField(cmd, "templateTag", type);
+        Assert.assertEquals(type, cmd.getTemplateTag());
+    }
+
+    @Test
+    public void testGetTemplateTag() {
+        UpdateTemplateCmd cmd = new UpdateTemplateCmd();
+        ReflectionTestUtils.setField(cmd, "templateTag", null);
+        Assert.assertNull(cmd.getTemplateTag());
+        String tag = "ABC";
+        ReflectionTestUtils.setField(cmd, "templateTag", tag);
+        Assert.assertEquals(tag, cmd.getTemplateTag());
+    }
+}

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -2137,13 +2137,15 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
 
         // update template type
         TemplateType templateType = null;
+        String templateTag = null;
         if (cmd instanceof UpdateTemplateCmd) {
             boolean isAdmin = _accountMgr.isAdmin(account.getId());
             templateType = validateTemplateType(cmd, isAdmin, template.isCrossZones());
             if (cmd instanceof UpdateVnfTemplateCmd) {
                 VnfTemplateUtils.validateApiCommandParams(cmd, template);
                 vnfTemplateManager.updateVnfTemplate(template.getId(), (UpdateVnfTemplateCmd) cmd);
             }
+            templateTag = ((UpdateTemplateCmd)cmd).getTemplateTag();
         }
 
         // update is needed if any of the fields below got filled by the user
@@ -2160,6 +2162,7 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
                   isDynamicallyScalable == null &&
                   isRoutingTemplate == null &&
                   templateType == null &&
+                  templateTag == null &&
                   (! cleanupDetails && details == null) //update details in every case except this one
                   );
         if (!updateNeeded) {
@@ -2245,6 +2248,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
         } else if (templateType != null) {
             template.setTemplateType(templateType);
         }
+        if (templateTag != null) {
+            template.setTemplateTag(org.apache.commons.lang3.StringUtils.trimToNull(templateTag));
+        }
 
         validateDetails(template, details);
 

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -343,7 +343,7 @@
             </a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item ref="templatetag" name="name" v-if="isAdminRole">
+        <a-form-item ref="templatetag" name="templatetag" v-if="isAdminRole">
           <template #label>
             <tooltip-label :title="$t('label.templatetag')" :tooltip="apiParams.templatetag.description"/>
           </template>

ui/src/views/image/UpdateTemplate.vue

@@ -177,6 +177,15 @@
             </a-select-option>
           </a-select>
         </a-form-item>
+        <a-form-item ref="templatetag" name="templatetag" v-if="isAdmin">
+          <template #label>
+            <tooltip-label :title="$t('label.templatetag')" :tooltip="apiParams.templatetag.description"/>
+          </template>
+          <a-input
+            v-model:value="form.templatetag"
+            :placeholder="apiParams.templatetag.description"
+            v-focus="currentForm !== 'Create'"/>
+        </a-form-item>
 
         <div :span="24" class="action-button">
           <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
@@ -206,6 +215,7 @@ export default {
   data () {
     return {
       templatetypes: ['BUILTIN', 'USER', 'SYSTEM', 'ROUTING', 'VNF'],
+      emptyAllowedFields: ['templatetag'],
       rootDisk: {},
       nicAdapterType: {},
       keyboardType: {},
@@ -247,6 +257,7 @@ export default {
       const resourceFields = ['name', 'displaytext', 'passwordenabled', 'ostypeid', 'isdynamicallyscalable', 'userdataid', 'userdatapolicy']
       if (this.isAdmin) {
         resourceFields.push('templatetype')
+        resourceFields.push('templatetag')
       }
       for (var field of resourceFields) {
         var fieldValue = this.resource[field]
@@ -286,6 +297,9 @@ export default {
       this.fetchUserdataPolicy()
     },
     isValidValueForKey (obj, key) {
+      if (this.emptyAllowedFields.includes(key) && obj[key] === '') {
+        return true
+      }
       return key in obj && obj[key] != null && obj[key] !== undefined && obj[key] !== ''
     },
     fetchOsTypes () {