From db87c342c06c43f43ca1c205b0acc1e45110c732 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Thu, 4 Jan 2024 17:53:30 +0000
Subject: [PATCH 1/2] Split agent templates into multiple pages

---
 pom.xml                                       |   6 +-
 .../azure/vmagent/AzureVMAgentTemplate.java   | 138 +++-
 .../microsoft/azure/vmagent/AzureVMCloud.java |  62 +-
 .../vmagent/AzureVMAgentTemplate/config.jelly | 605 +++++++++---------
 .../vmagent/AzureVMAgentTemplate/index.jelly  |  40 ++
 .../AzureVMAgentTemplate/index.properties     |   1 +
 .../AzureVMAgentTemplate/sidepanel.jelly      |  12 +
 .../AzureVMAgentTemplate/sidepanel.properties |   1 +
 .../azure/vmagent/AzureVMCloud/config.jelly   |   6 +-
 .../azure/vmagent/AzureVMCloud/new.jelly      |  27 +
 .../vmagent/AzureVMCloud/sidepanel.jelly      |  18 +
 .../vmagent/AzureVMCloud/sidepanel.properties |   1 +
 .../vmagent/AzureVMCloud/templates.jelly      |  65 ++
 13 files changed, 635 insertions(+), 347 deletions(-)
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.jelly
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.properties
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.jelly
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.properties
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/new.jelly
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.jelly
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.properties
 create mode 100644 src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/templates.jelly

diff --git a/pom.xml b/pom.xml
index 0bed254d..8c9cef14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <properties>
         <changelist>9999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/azure-vm-agents-plugin</gitHubRepo>
-        <jenkins.version>2.387.3</jenkins.version>
+        <jenkins.version>2.426.1</jenkins.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <hpi.compatibleSinceVersion>883</hpi.compatibleSinceVersion>
     </properties>
@@ -54,8 +54,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2543.vfb_1a_5fb_9496d</version>
+                <artifactId>bom-2.426.x</artifactId>
+                <version>2675.v1515e14da_7a_6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
index 4f690a8e..0c7aded8 100644
--- a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
+++ b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
@@ -54,17 +54,24 @@
 import hudson.model.TaskListener;
 import hudson.model.labels.LabelAtom;
 import hudson.security.ACL;
+import hudson.slaves.Cloud;
 import hudson.slaves.RetentionStrategy;
+import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import jenkins.model.Jenkins;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
+import org.kohsuke.stapler.HttpRedirect;
+import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.verb.POST;
 
 import javax.servlet.ServletException;
@@ -1421,6 +1428,49 @@ public List<String> verifyTemplate() throws Exception {
                 nsgName);
     }
 
+    /**
+     * Deletes the template.
+     */
+    @POST
+    public HttpResponse doDoDelete(@AncestorInPath AzureVMCloud azureVMCloud) throws IOException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        if (azureVMCloud == null) {
+            throw new IllegalStateException("Cloud could not be found");
+        }
+        azureVMCloud.removeTemplate(this);
+        j.save();
+        // take the user back.
+        return new HttpRedirect("../../templates");
+    }
+
+    @POST
+    public HttpResponse doConfigSubmit(StaplerRequest req, @AncestorInPath AzureVMCloud azureVMCloud)
+            throws IOException, ServletException, Descriptor.FormException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        if (azureVMCloud == null) {
+            throw new IllegalStateException("Cloud could not be found");
+        }
+        azureVMCloud.removeTemplate(this);
+        AzureVMAgentTemplate newTemplate = reconfigure(req, req.getSubmittedForm());
+        if (StringUtils.isBlank(newTemplate.getTemplateName())) {
+            throw new Descriptor.FormException("Template name is mandatory", "templateName");
+        }
+        azureVMCloud.addTemplate(newTemplate);
+        j.save();
+        // take the user back.
+        return FormApply.success("../../templates");
+    }
+
+    private AzureVMAgentTemplate reconfigure(@NonNull final StaplerRequest req, JSONObject form)
+            throws Descriptor.FormException {
+        if (form == null) {
+            return null;
+        }
+        return getDescriptor().newInstance(req, form);
+    }
+
     @Extension
     public static final class DescriptorImpl extends Descriptor<AzureVMAgentTemplate> {
 
@@ -1440,10 +1490,12 @@ public List<Descriptor<RetentionStrategy<?>>> getAzureVMRetentionStrategy() {
 
         @POST
         public ListBoxModel doFillVirtualMachineSizeItems(
-                @RelativePath("..") @QueryParameter String azureCredentialsId,
+                @QueryParameter("cloudName") String cloudName,
                 @QueryParameter String location) {
             Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
 
+            String azureCredentialsId = getAzureCredentialsIdFromCloud(cloudName);
+
             ListBoxModel model = new ListBoxModel();
             if (StringUtils.isBlank(azureCredentialsId)) {
                 return model;
@@ -1476,10 +1528,34 @@ public ListBoxModel doFillOsTypeItems() throws IOException, ServletException {
             return model;
         }
 
+        private String getAzureCredentialsIdFromCloud(String cloudName) {
+            AzureVMCloud cloud = getAzureCloud(cloudName);
+
+            if (cloud != null) {
+                return cloud.getAzureCredentialsId();
+            }
+
+            return null;
+        }
+
+        private AzureVMCloud getAzureCloud(String cloudName) {
+            Cloud cloud = Jenkins.get().getCloud(cloudName);
+
+            if (cloud instanceof AzureVMCloud) {
+                return (AzureVMCloud) cloud;
+            }
+
+            return null;
+        }
+
         @POST
-        public ListBoxModel doFillLocationItems(@RelativePath("..") @QueryParameter String azureCredentialsId) {
+        public ListBoxModel doFillLocationItems(
+                @QueryParameter("cloudName") String cloudName
+        ) {
             Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
 
+            String azureCredentialsId = getAzureCredentialsIdFromCloud(cloudName);
+
             ListBoxModel model = new ListBoxModel();
             if (StringUtils.isBlank(azureCredentialsId)) {
                 return model;
@@ -1511,21 +1587,27 @@ public AzureComputerLauncher getDefaultComputerLauncher() {
 
         @POST
         public ListBoxModel doFillAvailabilitySetItems(
-                @RelativePath("../..") @QueryParameter String azureCredentialsId,
-                @RelativePath("../..") @QueryParameter String resourceGroupReferenceType,
-                @RelativePath("../..") @QueryParameter String newResourceGroupName,
-                @RelativePath("../..") @QueryParameter String existingResourceGroupName,
+                @QueryParameter("cloudName") String cloudName,
                 @RelativePath("..") @QueryParameter String location) {
             Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
 
             ListBoxModel model = new ListBoxModel();
             model.add("--- Select Availability Set in current resource group and location ---", "");
+
+            AzureVMCloud cloud = getAzureCloud(cloudName);
+            if (cloud == null) {
+                return model;
+            }
+
+            String azureCredentialsId = cloud.getAzureCredentialsId();
             if (StringUtils.isBlank(azureCredentialsId)) {
                 return model;
             }
 
-            //resourceGroupReferenceType passed wrong value in 2.60.1-LTS, we won't use this value until bug resolved.
-            resourceGroupReferenceType = null;
+            String resourceGroupReferenceType = cloud.getResourceGroupReferenceType();
+            String newResourceGroupName = cloud.getNewResourceGroupName();
+            String existingResourceGroupName = cloud.getExistingResourceGroupName();
+
 
             try {
                 AzureResourceManager azureClient = AzureResourceManagerCache.get(azureCredentialsId);
@@ -1585,19 +1667,23 @@ public ListBoxModel doFillUsageModeItems() throws IOException, ServletException
 
         @POST
         public ListBoxModel doFillExistingStorageAccountNameItems(
-                @RelativePath("..") @QueryParameter String azureCredentialsId,
-                @RelativePath("..") @QueryParameter String resourceGroupReferenceType,
-                @RelativePath("..") @QueryParameter String newResourceGroupName,
-                @RelativePath("..") @QueryParameter String existingResourceGroupName,
+                @QueryParameter("cloudName") String cloudName,
                 @QueryParameter String storageAccountType) {
             Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
 
+            AzureVMCloud cloud = getAzureCloud(cloudName);
             ListBoxModel model = new ListBoxModel();
+            if (cloud == null) {
+                return model;
+            }
+            String azureCredentialsId = cloud.getAzureCredentialsId();
+
             if (StringUtils.isBlank(azureCredentialsId)) {
                 return model;
             }
-            //resourceGroupReferenceType passed wrong value in 2.60.1-LTS, we won't use this value until bug resolved.
-            resourceGroupReferenceType = null;
+            String resourceGroupReferenceType = cloud.getResourceGroupReferenceType();
+            String newResourceGroupName = cloud.getNewResourceGroupName();
+            String existingResourceGroupName = cloud.getExistingResourceGroupName();
 
             try {
                 AzureResourceManager azureClient = AzureResourceManagerCache.get(azureCredentialsId);
@@ -1775,12 +1861,7 @@ public FormValidation doCheckJvmOptions(@QueryParameter String value) {
 
         @POST
         public FormValidation doVerifyConfiguration(
-                @RelativePath("..") @QueryParameter String azureCredentialsId,
-                @RelativePath("..") @QueryParameter String resourceGroupReferenceType,
-                @RelativePath("..") @QueryParameter String newResourceGroupName,
-                @RelativePath("..") @QueryParameter String existingResourceGroupName,
-                @RelativePath("..") @QueryParameter String maxVirtualMachinesLimit,
-                @RelativePath("..") @QueryParameter String deploymentTimeout,
+                @QueryParameter String cloudName,
                 @QueryParameter String templateName,
                 @QueryParameter String labels,
                 @QueryParameter String location,
@@ -1802,7 +1883,6 @@ public FormValidation doVerifyConfiguration(
                 @QueryParameter String galleryName,
                 @QueryParameter String galleryImageDefinition,
                 @QueryParameter String galleryImageVersion,
-                @QueryParameter boolean galleryImageSpecialized,
                 @QueryParameter String gallerySubscriptionId,
                 @QueryParameter String galleryResourceGroup,
                 @RelativePath("..") @QueryParameter String sshConfig,
@@ -1830,13 +1910,13 @@ public FormValidation doVerifyConfiguration(
                     galleryResourceGroup
             );
 
-            String resourceGroupName = AzureVMCloud.getResourceGroupName(
-                    resourceGroupReferenceType, newResourceGroupName, existingResourceGroupName);
+            AzureVMCloud cloud = (AzureVMCloud) Jenkins.get().getCloud(cloudName);
+
             String storageAccountName = getStorageAccountName(
                     storageAccountNameReferenceType, newStorageAccountName, existingStorageAccountName);
             if (storageAccountName.trim().isEmpty()) {
                 storageAccountName = AzureVMAgentTemplate.generateUniqueStorageAccountName(
-                        resourceGroupName, templateName);
+                        cloud.getResourceGroupName(), templateName);
             }
 
             LOGGER.log(Level.INFO,
@@ -1876,7 +1956,7 @@ public FormValidation doVerifyConfiguration(
                             "",
                             "",
                             "",
-                            resourceGroupName,
+                            cloud.getResourceGroupName(),
                             templateName,
                             labels,
                             location,
@@ -1909,8 +1989,8 @@ public FormValidation doVerifyConfiguration(
 
             // First validate the subscription info.  If it is not correct,
             // then we can't validate the
-            String result = AzureClientHolder.getDelegate(azureCredentialsId)
-                    .verifyConfiguration(resourceGroupName, deploymentTimeout);
+            String result = AzureClientHolder.getDelegate(cloud.getAzureCredentialsId())
+                    .verifyConfiguration(cloud.getResourceGroupName(), String.valueOf(cloud.getDeploymentTimeout()));
             if (!result.equals(Constants.OP_SUCCESS)) {
                 return FormValidation.error(result);
             }
@@ -1920,7 +2000,7 @@ public FormValidation doVerifyConfiguration(
                 azureComputerLauncher.setSshConfig(sshConfig);
             }
 
-            final List<String> errors = AzureClientHolder.getDelegate(azureCredentialsId).verifyTemplate(
+            final List<String> errors = AzureClientHolder.getDelegate(cloud.getAzureCredentialsId()).verifyTemplate(
                     templateName,
                     labels,
                     location,
@@ -1940,7 +2020,7 @@ public FormValidation doVerifyConfiguration(
                     subnetName,
                     new AzureVMCloudRetensionStrategy(0),
                     jvmOptions,
-                    resourceGroupName,
+                    cloud.getResourceGroupName(),
                     false,
                     usePrivateIP,
                     nsgName);
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
index 27ec9ff4..45c29033 100644
--- a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
+++ b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
@@ -47,10 +47,13 @@
 import hudson.slaves.Cloud;
 import hudson.slaves.NodeProvisioner.PlannedNode;
 import hudson.slaves.SlaveComputer;
+import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import hudson.util.StreamTaskListener;
+import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.cloudstats.CloudStatistics;
 import org.jenkinsci.plugins.cloudstats.ProvisioningActivity;
@@ -59,7 +62,10 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
+import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 
@@ -321,6 +327,16 @@ public final void setVmTemplates(List<AzureVMAgentTemplate> newTemplates) {
         this.vmTemplates = new CopyOnWriteArrayList<>(newTemplates);
     }
 
+    public void addTemplate(AzureVMAgentTemplate template) {
+        template.addAzureCloudReference(this);
+        ensureVmTemplateList();
+        vmTemplates.add(template);
+    }
+
+    public void removeTemplate(AzureVMAgentTemplate t) {
+        this.vmTemplates.remove(t);
+    }
+
     public List<AzureTagPair> getCloudTags() {
         return cloudTags;
     }
@@ -483,6 +499,11 @@ public AzureVMAgentTemplate getAzureAgentTemplate(Label label) {
         return null;
     }
 
+    @SuppressWarnings("unused") // called by jelly
+    public AzureVMAgentTemplate getTemplate(String name) {
+        return getAzureAgentTemplate(name);
+    }
+
     /**
      * Returns agent template associated with the name.
      *
@@ -490,16 +511,7 @@ public AzureVMAgentTemplate getAzureAgentTemplate(Label label) {
      * @return Agent template that has the name assigned
      */
     public AzureVMAgentTemplate getAzureAgentTemplate(String name) {
-        if (StringUtils.isBlank(name)) {
-            return null;
-        }
-
-        for (AzureVMAgentTemplate agentTemplate : vmTemplates) {
-            if (name.equals(agentTemplate.getTemplateName())) {
-                return agentTemplate;
-            }
-        }
-        return null;
+        return getVmTemplates().stream().filter(t -> name.equals(t.getTemplateName())).findFirst().orElse(null);
     }
 
     /**
@@ -1036,6 +1048,36 @@ public AzureVMManagementServiceDelegate getServiceDelegate() {
         return AzureVMManagementServiceDelegate.getInstance(getAzureClient(), credentialsId);
     }
 
+    @Restricted(NoExternalUse.class) // jelly
+    public AzureVMAgentTemplate.DescriptorImpl getTemplateDescriptor() {
+        return (AzureVMAgentTemplate.DescriptorImpl) Jenkins.get().getDescriptorOrDie(AzureVMAgentTemplate.class);
+    }
+
+    @POST
+    public HttpResponse doCreate(StaplerRequest req, StaplerResponse rsp)
+            throws IOException, ServletException, Descriptor.FormException {
+        Jenkins j = Jenkins.get();
+        j.checkPermission(Jenkins.ADMINISTER);
+        AzureVMAgentTemplate newTemplate = getTemplateDescriptor().newInstance(req, req.getSubmittedForm());
+
+        if (StringUtils.isBlank(newTemplate.getTemplateName())) {
+            throw new Descriptor.FormException("Template name is mandatory", "templateName");
+        }
+
+        addTemplate(newTemplate);
+        j.save();
+        // take the user back.
+        return FormApply.success("templates");
+    }
+
+    @Override
+    public Cloud reconfigure(@NonNull StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        // cloud configuration doesn't contain templates anymore, so just keep existing ones.
+        var newInstance = (AzureVMCloud) super.reconfigure(req, form);
+        newInstance.setVmTemplates(this.vmTemplates);
+        return newInstance;
+    }
+
     @Extension
     public static class DescriptorImpl extends Descriptor<Cloud> {
 
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly
index d31fb240..464b1053 100644
--- a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly
@@ -1,333 +1,334 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:c="/lib/credentials"
          xmlns:f="/lib/form" xmlns:l="/lib/layout">
-    <div>
-      <f:entry title="${%Template_Name}" field="templateName"
-               help="/plugin/azure-vm-agents/help-templateName.html">
+  <f:entry title="${%Template_Name}" field="templateName"
+           help="/plugin/azure-vm-agents/help-templateName.html">
+    <f:textbox/>
+  </f:entry>
+  <f:section title="${%General_Configuration}">
+
+    <f:entry title="${%Template_Description}" field="templateDesc"
+             help="/plugin/azure-vm-agents/help-templateDesc.html">
+      <f:textbox/>
+    </f:entry>
+
+    <f:entry title="${%Labels}" field="labels" help="/plugin/azure-vm-agents/help-labels.html">
+      <f:textbox/>
+    </f:entry>
+
+    <f:entry title="${%Admin_Credentials}" field="credentialsId"
+             help="/plugin/azure-vm-agents/help-credentials.html">
+      <c:select expressionAllowed="false"/>
+    </f:entry>
+
+    <f:entry title="${%Max_Virtual_Machines_Limit}" field="maxVirtualMachinesLimit"
+             help="/plugin/azure-vm-agents/help-maxVirtualMachinesLimit.html">
+      <f:number/>
+    </f:entry>
+
+    <f:entry title="${%Custom_Tag}" field="tags">
+      <f:repeatableProperty field="tags" noAddButton="${!h.hasPermission(app.ADMINISTER)}">
+        <l:isAdmin>
+          <f:entry>
+            <div align="right">
+              <f:repeatableDeleteButton/>
+            </div>
+          </f:entry>
+        </l:isAdmin>
+      </f:repeatableProperty>
+    </f:entry>
+
+    <f:entry title="${%Agent_Workspace}" field="agentWorkspace"
+             help="/plugin/azure-vm-agents/help-agentWorkspace.html">
+      <f:textbox/>
+    </f:entry>
+
+    <f:entry title="${%Location}" field="location" help="/plugin/azure-vm-agents/help-location.html">
+      <f:select/>
+    </f:entry>
+
+    <f:dropdownList title="${%Availability_Options}" name="availabilityType"
+                    help="/plugin/azure-vm-agents/help-availability.html">
+      <f:dropdownListBlock title="${%No_Availability}" value="unknown"
+                           selected="${instance == null || instance.getAvailabilityType() == 'unknown'}">
+      </f:dropdownListBlock>
+      <f:dropdownListBlock title="${%Availability_Set}" value="availabilitySet"
+                           selected="${instance.getAvailabilitySet() != null}">
+        <f:entry title="${%name}" field="availabilitySet"
+                 help="/plugin/azure-vm-agents/help-availabilitySet.html">
+          <f:select/>
+        </f:entry>
+      </f:dropdownListBlock>
+    </f:dropdownList>
+
+    <f:entry title="${%Virtual_Machine_Size}" field="virtualMachineSize"
+             help="/plugin/azure-vm-agents/help-virtualMachineSize.html">
+      <f:select/>
+    </f:entry>
+
+    <f:entry title="${%Storage_Account_Type}" field="storageAccountType"
+             help="/plugin/azure-vm-agents/help-storageAccountType.html">
+      <f:select/>
+    </f:entry>
+
+    <f:entry title="${%Storage_Account_Name}">
+      <f:radioBlock name="storageAccountNameReferenceType" value="new" title="${%Storage_Account_Create_New}"
+                    checked="${instance == null || instance.isStorageAccountNameReferenceTypeEquals('new')}"
+                    inline="true">
+        <f:entry title="${%Name}" field="newStorageAccountName"
+                 help="/plugin/azure-vm-agents/help-storageAccountName.html">
+          <f:textbox/>
+        </f:entry>
+      </f:radioBlock>
+
+      <f:radioBlock name="storageAccountNameReferenceType" value="existing"
+                    title="${%Storage_Account_Use_Exist}"
+                    checked="${instance.isStorageAccountNameReferenceTypeEquals('existing')}" inline="true">
+        <f:entry title="${%Name}" field="existingStorageAccountName"
+                 help="/plugin/azure-vm-agents/help-storageAccountName.html">
+          <f:select/>
+        </f:entry>
+      </f:radioBlock>
+    </f:entry>
+
+    <f:entry title="${%Disk_Type}" field="diskType" help="/plugin/azure-vm-agents/help-diskType.html">
+      <f:select/>
+    </f:entry>
+
+    <f:entry title="${%OS disk storage account type}" field="osDiskStorageAccountType">
+      <f:select/>
+    </f:entry>
+
+    <f:entry title="${%Use_Ephemeral_OS_Disk}" field="ephemeralOSDisk">
+      <f:checkbox/>
+    </f:entry>
+
+    <f:entry title="${%OS_Disk_Size}" field="osDiskSize" help="/plugin/azure-vm-agents/help-osDiskSize.html">
+      <f:textbox/>
+    </f:entry>
+
+    <f:entry title="${%Enable_Encryption_At_Host}" field="encryptionAtHost">
+      <f:checkbox/>
+    </f:entry>
+
+    <f:dropdownDescriptorSelector field="retentionStrategy" title="${%Retention_Strategy}"
+                                  descriptors="${descriptor.azureVMRetentionStrategy}"/>
+
+    <f:entry title="${%shutdownOnIdle}" field="shutdownOnIdle"
+             help="/plugin/azure-vm-agents/help-shutdownOnIdle.html">
+      <f:checkbox/>
+    </f:entry>
+
+    <f:entry title="${%Usage}" field="usageMode" help="/plugin/azure-vm-agents/help-slaveMode.html">
+      <f:select/>
+    </f:entry>
+
+    <f:entry title="${%Maximum_Deployment_Size}" field="maximumDeploymentSize">
+      <f:number default="10"/>
+    </f:entry>
+
+    <f:entry title="${%Spot instance}" field="spotInstance">
+      <f:checkbox/>
+    </f:entry>
+
+    <f:entry title="${%Enable_MSI}" field="enableMSI">
+      <f:checkbox/>
+    </f:entry>
+
+    <f:optionalBlock title="${%Enable_UAMI}" field="enableUAMI" inline="true">
+      <f:entry title="${%UAMI_ID}" field="uamiID">
         <f:textbox/>
       </f:entry>
-      <l:isAdmin>
-        <f:block>
-          <div align="right">
-            <f:repeatableDeleteButton value="${%Delete_Template}"/>
-          </div>
-        </f:block>
-      </l:isAdmin>
-      <f:advanced title="${%Agent template details}">
-        <f:section title="${%General_Configuration}">
-
-          <f:entry title="${%Template_Description}" field="templateDesc"
-                   help="/plugin/azure-vm-agents/help-templateDesc.html">
-            <f:textbox/>
-          </f:entry>
-
-          <f:entry title="${%Labels}" field="labels" help="/plugin/azure-vm-agents/help-labels.html">
-            <f:textbox/>
-          </f:entry>
+    </f:optionalBlock>
 
-          <f:entry title="${%Admin_Credentials}" field="credentialsId"
-                   help="/plugin/azure-vm-agents/help-credentials.html">
-            <c:select expressionAllowed="false"/>
-          </f:entry>
+    <f:entry title="${%Enable_Accelerated_Networking}" field="acceleratedNetworking">
+      <f:checkbox/>
+    </f:entry>
 
-          <f:entry title="${%Max_Virtual_Machines_Limit}" field="maxVirtualMachinesLimit"
-                   help="/plugin/azure-vm-agents/help-maxVirtualMachinesLimit.html">
-            <f:number/>
-          </f:entry>
+  </f:section>
 
-          <f:entry title="${%Custom_Tag}" field="tags">
-            <f:repeatableProperty field="tags" noAddButton="${!h.hasPermission(app.ADMINISTER)}">
-              <l:isAdmin>
-                <f:entry>
-                  <div align="right">
-                    <f:repeatableDeleteButton/>
-                  </div>
-                </f:entry>
-              </l:isAdmin>
-            </f:repeatableProperty>
-          </f:entry>
+  <f:section title="${%Image_Configuration}">
+    <f:radioBlock name="imageTopLevelType" value="basic" title="${%Built_In_Image}"
+                  checked="${instance == null || instance.isTopLevelType('basic')}"
+                  inline="true">
+      <f:entry field="builtInImage">
+        <f:select/>
+      </f:entry>
 
-          <f:entry title="${%Agent_Workspace}" field="agentWorkspace"
-                   help="/plugin/azure-vm-agents/help-agentWorkspace.html">
+      <f:section title="${%Pre_Installed_Tools}">
+        <f:entry title="Install Git" field="installGit">
+          <f:checkbox/>
+        </f:entry>
+
+        <f:entry title="Install Maven" field="installMaven">
+          <f:checkbox/>
+        </f:entry>
+
+        <f:entry title="Install Docker" field="installDocker">
+          <f:checkbox/>
+        </f:entry>
+      </f:section>
+    </f:radioBlock>
+
+    <f:radioBlock name="imageTopLevelType" value="advanced" title="${%Advanced_Image}"
+                  checked="${instance.isTopLevelType('advanced')}" inline="true">
+      <f:dropdownList name="imageReference">
+        <f:dropdownListBlock title="${%Custom_Image}" value="custom"
+                             selected="${instance == null || instance.isType('custom')}">
+          <f:entry title="${%Image}" field="uri" help="/plugin/azure-vm-agents/help-image.html">
             <f:textbox/>
           </f:entry>
+        </f:dropdownListBlock>
 
-          <f:entry title="${%Location}" field="location" help="/plugin/azure-vm-agents/help-location.html">
-            <f:select/>
-          </f:entry>
-
-          <f:dropdownList title="${%Availability_Options}" name="availabilityType"
-                          help="/plugin/azure-vm-agents/help-availability.html">
-            <f:dropdownListBlock title="${%No_Availability}" value="unknown"
-                                 selected="${instance == null || instance.getAvailabilityType() == 'unknown'}">
-            </f:dropdownListBlock>
-            <f:dropdownListBlock title="${%Availability_Set}" value="availabilitySet"
-                                 selected="${instance.getAvailabilitySet() != null}">
-              <f:entry title="${%name}" field="availabilitySet"
-                       help="/plugin/azure-vm-agents/help-availabilitySet.html">
-                <f:select/>
-              </f:entry>
-            </f:dropdownListBlock>
-          </f:dropdownList>
-
-          <f:entry title="${%Virtual_Machine_Size}" field="virtualMachineSize"
-                   help="/plugin/azure-vm-agents/help-virtualMachineSize.html">
-            <f:select/>
+        <f:dropdownListBlock title="${%Custom_Managed_Image}" value="customImage"
+                             selected="${instance.isType('customImage')}">
+          <f:entry title="${%Image_Id}" field="id"
+                   help="/plugin/azure-vm-agents/help-customReference.html">
+            <f:textbox/>
           </f:entry>
+        </f:dropdownListBlock>
 
-          <f:entry title="${%Storage_Account_Type}" field="storageAccountType"
-                   help="/plugin/azure-vm-agents/help-storageAccountType.html">
-            <f:select/>
+        <f:dropdownListBlock title="${%Marketplace_Image}" value="reference"
+                             selected="${instance.isType('reference')}">
+          <f:entry title="${%Image_Publisher}" field="publisher"
+                   help="/plugin/azure-vm-agents/help-imageReference.html">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Storage_Account_Name}">
-            <f:radioBlock name="storageAccountNameReferenceType" value="new" title="${%Storage_Account_Create_New}"
-                          checked="${instance == null || instance.isStorageAccountNameReferenceTypeEquals('new')}"
-                          inline="true">
-              <f:entry title="${%Name}" field="newStorageAccountName"
-                       help="/plugin/azure-vm-agents/help-storageAccountName.html">
-                <f:textbox/>
-              </f:entry>
-            </f:radioBlock>
-
-            <f:radioBlock name="storageAccountNameReferenceType" value="existing"
-                          title="${%Storage_Account_Use_Exist}"
-                          checked="${instance.isStorageAccountNameReferenceTypeEquals('existing')}" inline="true">
-              <f:entry title="${%Name}" field="existingStorageAccountName"
-                       help="/plugin/azure-vm-agents/help-storageAccountName.html">
-                <f:select/>
-              </f:entry>
-            </f:radioBlock>
+          <f:entry title="${%Image_Offer}" field="offer"
+                   help="/plugin/azure-vm-agents/help-imageReference.html">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Disk_Type}" field="diskType" help="/plugin/azure-vm-agents/help-diskType.html">
-            <f:select/>
+          <f:entry title="${%Image_Sku}" field="sku" help="/plugin/azure-vm-agents/help-imageReference.html">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%OS disk storage account type}" field="osDiskStorageAccountType">
-            <f:select/>
+          <f:entry title="${%Image_Version}" field="version"
+                   help="/plugin/azure-vm-agents/help-imageReference.html">
+            <f:textbox default="latest"/>
           </f:entry>
+        </f:dropdownListBlock>
 
-          <f:entry title="${%Use_Ephemeral_OS_Disk}" field="ephemeralOSDisk">
-            <f:checkbox/>
-          </f:entry>
-
-          <f:entry title="${%OS_Disk_Size}" field="osDiskSize" help="/plugin/azure-vm-agents/help-osDiskSize.html">
+        <f:dropdownListBlock title="${%Gallery_Image}" value="gallery" selected="${instance.isType('gallery')}">
+          <f:entry title="${%Gallery_Subscription_Id}" field="gallerySubscriptionId">
             <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Enable_Encryption_At_Host}" field="encryptionAtHost">
-            <f:checkbox/>
-          </f:entry>
-
-          <f:dropdownDescriptorSelector field="retentionStrategy" title="${%Retention_Strategy}"
-                                        descriptors="${descriptor.azureVMRetentionStrategy}"/>
-
-          <f:entry title="${%shutdownOnIdle}" field="shutdownOnIdle"
-                   help="/plugin/azure-vm-agents/help-shutdownOnIdle.html">
-            <f:checkbox/>
+          <f:entry title="${%Gallery_Resource_Group}" field="galleryResourceGroup">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Usage}" field="usageMode" help="/plugin/azure-vm-agents/help-slaveMode.html">
-            <f:select/>
+          <f:entry title="${%Gallery_Name}" field="galleryName">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Maximum_Deployment_Size}" field="maximumDeploymentSize">
-            <f:number default="10"/>
+          <f:entry title="${%Gallery_Image_Definition}" field="galleryImageDefinition">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Spot instance}" field="spotInstance">
-            <f:checkbox/>
+          <f:entry title="${%Gallery_Image_Version}" field="galleryImageVersion">
+            <f:textbox/>
           </f:entry>
-
-          <f:entry title="${%Enable_MSI}" field="enableMSI">
+          <f:entry title="${%Gallery_Image_Specialized}" field="galleryImageSpecialized">
             <f:checkbox/>
           </f:entry>
+        </f:dropdownListBlock>
+      </f:dropdownList>
 
-          <f:optionalBlock title="${%Enable_UAMI}" field="enableUAMI" inline="true">
-            <f:entry title="${%UAMI_ID}" field="uamiID">
-              <f:textbox/>
-            </f:entry>
-          </f:optionalBlock>
-
-          <f:entry title="${%Enable_Accelerated_Networking}" field="acceleratedNetworking">
-            <f:checkbox/>
-          </f:entry>
+      <f:entry title="${%Os_Type}" field="osType" help="/plugin/azure-vm-agents/help-osType.html">
+        <f:select/>
+      </f:entry>
 
-        </f:section>
-
-        <f:section title="${%Image_Configuration}">
-          <f:radioBlock name="imageTopLevelType" value="basic" title="${%Built_In_Image}"
-                        checked="${instance == null || instance.isTopLevelType('basic')}"
-                        inline="true">
-            <f:entry field="builtInImage">
-              <f:select/>
-            </f:entry>
-
-            <f:section title="${%Pre_Installed_Tools}">
-              <f:entry title="Install Git" field="installGit">
-                <f:checkbox/>
-              </f:entry>
-
-              <f:entry title="Install Maven" field="installMaven">
-                <f:checkbox/>
-              </f:entry>
-
-              <f:entry title="Install Docker" field="installDocker">
-                <f:checkbox/>
-              </f:entry>
-            </f:section>
-          </f:radioBlock>
-
-          <f:radioBlock name="imageTopLevelType" value="advanced" title="${%Advanced_Image}"
-                        checked="${instance.isTopLevelType('advanced')}" inline="true">
-            <f:dropdownList name="imageReference">
-              <f:dropdownListBlock title="${%Custom_Image}" value="custom"
-                                   selected="${instance == null || instance.isType('custom')}">
-                <f:entry title="${%Image}" field="uri" help="/plugin/azure-vm-agents/help-image.html">
-                  <f:textbox/>
-                </f:entry>
-              </f:dropdownListBlock>
-
-              <f:dropdownListBlock title="${%Custom_Managed_Image}" value="customImage"
-                                   selected="${instance.isType('customImage')}">
-                <f:entry title="${%Image_Id}" field="id"
-                         help="/plugin/azure-vm-agents/help-customReference.html">
-                  <f:textbox/>
-                </f:entry>
-              </f:dropdownListBlock>
-
-              <f:dropdownListBlock title="${%Marketplace_Image}" value="reference"
-                                   selected="${instance.isType('reference')}">
-                <f:entry title="${%Image_Publisher}" field="publisher"
-                         help="/plugin/azure-vm-agents/help-imageReference.html">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Image_Offer}" field="offer"
-                         help="/plugin/azure-vm-agents/help-imageReference.html">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Image_Sku}" field="sku" help="/plugin/azure-vm-agents/help-imageReference.html">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Image_Version}" field="version"
-                         help="/plugin/azure-vm-agents/help-imageReference.html">
-                  <f:textbox default="latest"/>
-                </f:entry>
-              </f:dropdownListBlock>
-
-              <f:dropdownListBlock title="${%Gallery_Image}" value="gallery" selected="${instance.isType('gallery')}">
-                <f:entry title="${%Gallery_Subscription_Id}" field="gallerySubscriptionId">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Gallery_Resource_Group}" field="galleryResourceGroup">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Gallery_Name}" field="galleryName">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Gallery_Image_Definition}" field="galleryImageDefinition">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Gallery_Image_Version}" field="galleryImageVersion">
-                  <f:textbox/>
-                </f:entry>
-                <f:entry title="${%Gallery_Image_Specialized}" field="galleryImageSpecialized">
-                  <f:checkbox/>
-                </f:entry>
-              </f:dropdownListBlock>
-            </f:dropdownList>
-
-            <f:entry title="${%Os_Type}" field="osType" help="/plugin/azure-vm-agents/help-osType.html">
-              <f:select/>
-            </f:entry>
-
-            <f:dropdownDescriptorSelector
-                title="${%Launch_Method}"
-                field="launcher"
-                default="${descriptor.defaultComputerLauncher}"
-            />
-
-            <f:section title="${%Initialization_Configuration}">
-              <f:entry title="${%Init_Script}" field="initScript" help="/plugin/azure-vm-agents/help-initScript.html">
-                <f:textarea/>
-              </f:entry>
-
-              <f:entry title="${%Execute_Init_Script_As_Root}" field="executeInitScriptAsRoot"
-                       help="/plugin/azure-vm-agents/help-executeInitScriptAsRoot.html">
-                <f:checkbox default="true"/>
-              </f:entry>
-
-              <f:entry title="${%Do_Not_Use_Machine_If_Init_Fails}" field="doNotUseMachineIfInitFails"
-                       help="/plugin/azure-vm-agents/help-doNotUseMachineIfInitFails.html">
-                <f:checkbox default="true"/>
-              </f:entry>
-
-              <f:entry title="${%Terminate_Script}" field="terminateScript"
-                       help="/plugin/azure-vm-agents/help-terminateScript.html">
-                <f:textarea/>
-              </f:entry>
-
-            </f:section>
-
-            <f:advanced>
-              <f:entry title="${%VirtualNetwork_Name}" field="virtualNetworkName"
-                       help="/plugin/azure-vm-agents/help-virtualNetworkName.html">
-                <f:textbox/>
-              </f:entry>
-
-              <f:entry title="${%VirtualNetworkResourceGroup_Name}" field="virtualNetworkResourceGroupName"
-                       help="/plugin/azure-vm-agents/help-virtualNetworkResourceGroupName.html">
-                <f:textbox/>
-              </f:entry>
-
-              <f:entry title="${%Subnet_Name}" field="subnetName" help="/plugin/azure-vm-agents/help-subnetName.html">
-                <f:textbox/>
-              </f:entry>
-
-              <f:entry title="${%Use_Private_Ip}" field="usePrivateIP"
-                       help="/plugin/azure-vm-agents/help-agentPrivateIp.html">
-                <f:checkbox default="false"/>
-              </f:entry>
-
-              <f:entry title="${%NSG_Name}" field="nsgName" help="/plugin/azure-vm-agents/help-nsgName.html">
-                <f:textbox/>
-              </f:entry>
-
-              <f:entry title="${%Java path}" field="javaPath" help="/plugin/azure-vm-agents/help-javaPath.html">
-                <f:textbox default="java"/>
-              </f:entry>
-
-              <f:entry title="${%JVM_Options}" field="jvmOptions" help="/plugin/azure-vm-agents/help-jvmOptions.html">
-                <f:textbox/>
-              </f:entry>
-
-              <f:entry title="${%Remoting options}">
-                <f:textbox field="remotingOptions"/>
-              </f:entry>
-
-              <f:entry title="${%noOfParallelJobs}" field="noOfParallelJobs"
-                       help="/plugin/azure-vm-agents/help-noOfParallelJobs.html">
-                <f:textbox default="${descriptor.getDefaultNoOfExecutors()}"/>
-              </f:entry>
-
-              <f:entry title="${%Template_Is_Disabled}" field="templateDisabled"
-                       help="/plugin/azure-vm-agents/help-templateDisabled.html">
-                <f:checkbox/>
-              </f:entry>
-
-              <f:entry title="${%Template_Status_Details}" field="templateStatusDetails"
-                       help="/plugin/azure-vm-agents/help-templateStatusDetails.html">
-                <f:textarea/>
-              </f:entry>
-            </f:advanced>
-          </f:radioBlock>
-        </f:section>
-        <l:isAdmin>
-          <f:validateButton title="${%Verify_Template}" progress="${%Verifying_Template_MSG}"
-                            method="verifyConfiguration"
-                            with="azureCredentialsId,resourceGroupReferenceType,newResourceGroupName,existingResourceGroupName,maxVirtualMachinesLimit,deploymentTimeout,templateName,labels,location,virtualMachineSize,storageAccountNameReferenceType,newStorageAccountName,existingStorageAccountName,storageAccountType,noOfParallelJobs,imageTopLevelType,builtInImage,image,osType,id,uri,publisher,offer,sku,version,galleryName,galleryImageDefinition,galleryImageVersion,galleryImageSpecialized,gallerySubscriptionId,galleryResourceGroup,sshConfig,initScript,credentialsId,virtualNetworkName,virtualNetworkResourceGroupName,subnetName,usePrivateIP,nsgName,jvmOptions"/>
-        </l:isAdmin>
+      <f:dropdownDescriptorSelector
+          title="${%Launch_Method}"
+          field="launcher"
+          default="${descriptor.defaultComputerLauncher}"
+      />
+
+      <f:section title="${%Initialization_Configuration}">
+        <f:entry title="${%Init_Script}" field="initScript" help="/plugin/azure-vm-agents/help-initScript.html">
+          <f:textarea/>
+        </f:entry>
+
+        <f:entry title="${%Execute_Init_Script_As_Root}" field="executeInitScriptAsRoot"
+                 help="/plugin/azure-vm-agents/help-executeInitScriptAsRoot.html">
+          <f:checkbox default="true"/>
+        </f:entry>
+
+        <f:entry title="${%Do_Not_Use_Machine_If_Init_Fails}" field="doNotUseMachineIfInitFails"
+                 help="/plugin/azure-vm-agents/help-doNotUseMachineIfInitFails.html">
+          <f:checkbox default="true"/>
+        </f:entry>
+
+        <f:entry title="${%Terminate_Script}" field="terminateScript"
+                 help="/plugin/azure-vm-agents/help-terminateScript.html">
+          <f:textarea/>
+        </f:entry>
+
+      </f:section>
+
+      <f:advanced>
+        <f:entry title="${%VirtualNetwork_Name}" field="virtualNetworkName"
+                 help="/plugin/azure-vm-agents/help-virtualNetworkName.html">
+          <f:textbox/>
+        </f:entry>
+
+        <f:entry title="${%VirtualNetworkResourceGroup_Name}" field="virtualNetworkResourceGroupName"
+                 help="/plugin/azure-vm-agents/help-virtualNetworkResourceGroupName.html">
+          <f:textbox/>
+        </f:entry>
+
+        <f:entry title="${%Subnet_Name}" field="subnetName" help="/plugin/azure-vm-agents/help-subnetName.html">
+          <f:textbox/>
+        </f:entry>
+
+        <f:entry title="${%Use_Private_Ip}" field="usePrivateIP"
+                 help="/plugin/azure-vm-agents/help-agentPrivateIp.html">
+          <f:checkbox default="false"/>
+        </f:entry>
+
+        <f:entry title="${%NSG_Name}" field="nsgName" help="/plugin/azure-vm-agents/help-nsgName.html">
+          <f:textbox/>
+        </f:entry>
+
+        <f:entry title="${%Java path}" field="javaPath" help="/plugin/azure-vm-agents/help-javaPath.html">
+          <f:textbox default="java"/>
+        </f:entry>
+
+        <f:entry title="${%JVM_Options}" field="jvmOptions" help="/plugin/azure-vm-agents/help-jvmOptions.html">
+          <f:textbox/>
+        </f:entry>
+
+        <f:entry title="${%Remoting options}">
+          <f:textbox field="remotingOptions"/>
+        </f:entry>
+
+        <f:entry title="${%noOfParallelJobs}" field="noOfParallelJobs"
+                 help="/plugin/azure-vm-agents/help-noOfParallelJobs.html">
+          <f:textbox default="${descriptor.getDefaultNoOfExecutors()}"/>
+        </f:entry>
+
+        <f:entry title="${%Template_Is_Disabled}" field="templateDisabled"
+                 help="/plugin/azure-vm-agents/help-templateDisabled.html">
+          <f:checkbox/>
+        </f:entry>
+
+        <f:entry title="${%Template_Status_Details}" field="templateStatusDetails"
+                 help="/plugin/azure-vm-agents/help-templateStatusDetails.html">
+          <f:textarea/>
+        </f:entry>
       </f:advanced>
-    </div>
+    </f:radioBlock>
+  </f:section>
+
+  <f:invisibleEntry>
+    <j:choose>
+      <j:when test="${it.cloudName != null}">
+        <f:readOnlyTextbox name="cloudName" value="${it.cloudName}"/>
+      </j:when>
+      <j:otherwise>
+        <f:readOnlyTextbox name="cloudName" value="${it.retrieveAzureCloudReference().cloudName}"/>
+      </j:otherwise>
+    </j:choose>
+  </f:invisibleEntry>
+
+  <l:isAdmin>
+    <f:validateButton title="${%Verify_Template}" progress="${%Verifying_Template_MSG}"
+                      method="verifyConfiguration"
+                      with="cloudName,templateName,labels,location,virtualMachineSize,storageAccountNameReferenceType,newStorageAccountName,existingStorageAccountName,storageAccountType,noOfParallelJobs,imageTopLevelType,builtInImage,image,osType,id,uri,publisher,offer,sku,version,galleryName,galleryImageDefinition,galleryImageVersion,galleryImageSpecialized,gallerySubscriptionId,galleryResourceGroup,sshConfig,initScript,credentialsId,virtualNetworkName,virtualNetworkResourceGroupName,subnetName,usePrivateIP,nsgName,jvmOptions"/>
+  </l:isAdmin>
 </j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.jelly
new file mode 100644
index 00000000..5893b084
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.jelly
@@ -0,0 +1,40 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+  <l:layout permission="${app.SYSTEM_READ}" title="${%Agent template}">
+    <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
+    <l:breadcrumb title="${it.templateName}"/>
+
+    <st:include page="sidepanel.jelly"/>
+    <l:main-panel>
+      <div class="jenkins-form">
+        <l:app-bar title="${%Agent template}">
+          <l:isAdmin>
+            <l:confirmationLink class="jenkins-button jenkins-!-destructive-color"
+                                href="doDelete"
+                                message="${%delete.template(it.templateName)}"
+                                post="true">
+              <l:icon src="symbol-trash"/>
+              ${%Delete agent template}
+            </l:confirmationLink>
+          </l:isAdmin>
+        </l:app-bar>
+      </div>
+      <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
+        <j:set var="instance" value="${it}"/>
+        <j:set var="descriptor" value="${instance.descriptor}"/>
+
+        <!-- main body of the configuration -->
+        <st:include it="${instance}" page="config.jelly"/>
+
+        <l:isAdmin>
+          <f:bottomButtonBar>
+            <f:submit value="${%Save}"/>
+          </f:bottomButtonBar>
+        </l:isAdmin>
+      </f:form>
+      <l:isAdmin>
+        <st:adjunct includes="lib.form.confirm"/>
+      </l:isAdmin>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.properties b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.properties
new file mode 100644
index 00000000..163775fc
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/index.properties
@@ -0,0 +1 @@
+delete.template=Delete the template ''{0}''?
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.jelly
new file mode 100644
index 00000000..545db2bd
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.jelly
@@ -0,0 +1,12 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+  <l:header />
+  <l:side-panel>
+    <l:tasks>
+      <l:task href="." icon="symbol-settings"
+              title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
+      <l:task href="../../templates" icon="symbol-details" title="${%Agent templates}"/>
+      <t:actions />
+    </l:tasks>
+  </l:side-panel>
+</j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.properties b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.properties
new file mode 100644
index 00000000..163775fc
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/sidepanel.properties
@@ -0,0 +1 @@
+delete.template=Delete the template ''{0}''?
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly
index 009ef89d..fe0e7a97 100644
--- a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly
@@ -56,7 +56,7 @@
       with="azureCredentialsId,maxVirtualMachinesLimit,deploymentTimeout,resourceGroupReferenceType,newResourceGroupName,existingResourceGroupName"/>
   </l:isAdmin>
 
-  <f:repeatable add="${%Azure_Virtual_Machine_Template}" field="vmTemplates" noAddButton="${!h.hasPermission(app.ADMINISTER)}">
-    <st:include page="config.jelly" class="${descriptor.clazz}"/>
-  </f:repeatable>
+  <div class="alert alert-info">
+    <a href="templates">${%Agent templates have moved}</a>.
+  </div>
 </j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/new.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/new.jelly
new file mode 100644
index 00000000..3f8bf8c5
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/new.jelly
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
+  <l:layout permission="${app.SYSTEM_READ}" title="${%New agent template}">
+    <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
+    <l:breadcrumb title="${%New agent template}"/>
+    <st:include page="sidepanel.jelly" it="${it}"/>
+    <l:main-panel>
+      <h1>${%New agent template}</h1>
+      <f:form method="post" action="create" name="config" class="jenkins-form">
+        <!-- main body of the configuration -->
+
+        <j:set var="descriptor" value="${it.templateDescriptor}"/>
+        <st:include class="${descriptor.clazz}" page="config.jelly"/>
+        <l:isAdmin>
+          <f:bottomButtonBar>
+            <f:submit value="${%Create}"/>
+          </f:bottomButtonBar>
+        </l:isAdmin>
+      </f:form>
+      <l:isAdmin>
+        <st:adjunct includes="lib.form.confirm"/>
+      </l:isAdmin>
+    </l:main-panel>
+  </l:layout>
+
+</j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.jelly
new file mode 100644
index 00000000..9668f300
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.jelly
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson">
+  <l:header />
+  <l:side-panel>
+    <l:tasks>
+      <l:task contextMenu="false" href="." icon="symbol-computer" title="${%Status}"/>
+      <l:task href="templates" icon="symbol-details" title="${%Agent templates}"/>
+      <l:task href="configure" icon="symbol-settings"
+              title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
+      <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}"/>
+      <t:actions />
+    </l:tasks>
+    <j:forEach var="action" items="${it.allActions}">
+      <st:include it="${action}" page="box.jelly" optional="true"/>
+    </j:forEach>
+  </l:side-panel>
+</j:jelly>
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.properties b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.properties
new file mode 100644
index 00000000..4d567328
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/sidepanel.properties
@@ -0,0 +1 @@
+delete.cloud=Delete the cloud ''{0}''?
diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/templates.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/templates.jelly
new file mode 100644
index 00000000..1d3e21c0
--- /dev/null
+++ b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/templates.jelly
@@ -0,0 +1,65 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <!-- with empty type attribute, takes full width space, works only because core doesn't provide a CSS "app-page-body-" -->
+  <l:layout title="${it.name} - ${%Agent templates}"
+            type="${request.hasParameter('expand') ? 'full-screen' : 'two-column'}">
+    <st:include page="sidepanel.jelly"/>
+
+    <l:main-panel>
+      <j:choose>
+        <j:when test="${not empty it.vmTemplates}">
+          <l:app-bar title="${it.name} - ${%Agent templates}">
+            <l:isAdmin>
+              <a name="newTemplate" class="jenkins-button jenkins-button--primary" href="new">
+                <l:icon src="symbol-add"/>
+                ${%Add an agent template}
+              </a>
+            </l:isAdmin>
+          </l:app-bar>
+
+          <table id="templates" class="jenkins-table sortable">
+            <thead>
+              <tr>
+                <th initialSortDir="down">${%Name}</th>
+                <th class="jenkins-table__cell--tight"/>
+              </tr>
+            </thead>
+            <tbody>
+              <j:forEach var="template" items="${it.vmTemplates}">
+                <tr id="template_${template.templateName}">
+                  <td>
+                    <a href="${it.getCloudUrl(request,app,cloud)}template/${template.templateName}" class="jenkins-table__button">${template.templateName}</a>
+                  </td>
+                  <td class="jenkins-table__cell--tight">
+                    <div class="jenkins-table__cell__button-wrapper">
+                      <a href="${it.getCloudUrl(request,app,cloud)}template/${template.templateName}" class="jenkins-table__button">
+                        <l:icon src="symbol-settings"/>
+                      </a>
+                    </div>
+                  </td>
+                </tr>
+              </j:forEach>
+            </tbody>
+          </table>
+        </j:when>
+        <j:otherwise>
+          <l:app-bar title="${it.name} - ${%Agent templates}"/>
+          <div >
+            <section>
+              <div>
+                <div class="jenkins-!-padding-bottom-3">No agent template added yet.</div>
+                <div>
+                  <a name="newTemplate" class="jenkins-button jenkins-button--primary" href="new">
+                    <l:icon src="symbol-add"/>
+                    ${%Add an agent template}
+                  </a>
+                </div>
+              </div>
+            </section>
+          </div>
+        </j:otherwise>
+      </j:choose>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>

From 4c76c0a70ea1c9d58d78ac137ec91ba4db0f7a5f Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Mon, 8 Jan 2024 11:07:01 +0000
Subject: [PATCH 2/2] Add template name validation

---
 .../microsoft/azure/vmagent/AzureVMAgentTemplate.java  |  5 +++++
 .../java/com/microsoft/azure/vmagent/AzureVMCloud.java | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
index 0c7aded8..334f631f 100644
--- a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
+++ b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
@@ -1457,6 +1457,11 @@ public HttpResponse doConfigSubmit(StaplerRequest req, @AncestorInPath AzureVMCl
         if (StringUtils.isBlank(newTemplate.getTemplateName())) {
             throw new Descriptor.FormException("Template name is mandatory", "templateName");
         }
+        boolean templateNameExists = azureCloud.templateNameExists(newTemplate.getTemplateName());
+        if (templateNameExists) {
+            throw new Descriptor.FormException("Agent template name must be unique", "templateName");
+        }
+
         azureVMCloud.addTemplate(newTemplate);
         j.save();
         // take the user back.
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
index 45c29033..6233a83c 100644
--- a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
+++ b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
@@ -1053,6 +1053,11 @@ public AzureVMAgentTemplate.DescriptorImpl getTemplateDescriptor() {
         return (AzureVMAgentTemplate.DescriptorImpl) Jenkins.get().getDescriptorOrDie(AzureVMAgentTemplate.class);
     }
 
+    boolean templateNameExists(String templateName) {
+        return vmTemplates.stream()
+                .anyMatch(template -> templateName.equals(template.getTemplateName()));
+    }
+
     @POST
     public HttpResponse doCreate(StaplerRequest req, StaplerResponse rsp)
             throws IOException, ServletException, Descriptor.FormException {
@@ -1064,6 +1069,11 @@ public HttpResponse doCreate(StaplerRequest req, StaplerResponse rsp)
             throw new Descriptor.FormException("Template name is mandatory", "templateName");
         }
 
+        boolean templateNameExists = templateNameExists(newTemplate.getTemplateName());
+        if (templateNameExists) {
+            throw new Descriptor.FormException("Agent template name must be unique", "templateName");
+        }
+
         addTemplate(newTemplate);
         j.save();
         // take the user back.