Allow selecting additional license types (#601)

jenkinsci · Dec 18, 2024 · 4742455 · 4742455
1 parent 45194a3
commit 4742455
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
@@ -1576,9 +1576,20 @@ public ListBoxModel doFillOsTypeItems() throws IOException, ServletException {
         @POST
         public ListBoxModel doFillLicenseTypeItems() {
             ListBoxModel model = new ListBoxModel();
-            model.add(Constants.LICENSE_TYPE_CLASSIC);
+            model.add(Constants.LICENSE_TYPE_NONE);
             model.add(Constants.LICENSE_TYPE_WINDOWS_CLIENT);
             model.add(Constants.LICENSE_TYPE_WINDOWS_SERVER);
+            model.add("RHEL_BASE");
+            model.add("RHEL_BYOS");
+            model.add("RHEL_EUS");
+            model.add("RHEL_SAPAPPS");
+            model.add("RHEL_SAPHA");
+            model.add("RHEL_BASESAPAPPS");
+            model.add("RHEL_BASESAPHA");
+            model.add("SLES");
+            model.add("SLES_BYOS");
+            model.add("SLES_SAP");
+            model.add("SLES_HPC");
             return model;
         }
 

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java
@@ -732,7 +732,7 @@ public AzureVMDeploymentInfo createDeployment(
                 putParameter(parameters, "authenticationType", "key");
             }
 
-            if (!Constants.LICENSE_TYPE_CLASSIC.equals(template.getLicenseType())) {
+            if (!Constants.LICENSE_TYPE_NONE.equals(template.getLicenseType())) {
                 addLicenseType(tmp, template.getLicenseType());
             }
 
@@ -867,15 +867,13 @@ private void addAcceleratedNetworking(JsonNode template) {
     }
 
     private void addLicenseType(JsonNode template, String licenseType) {
-        if (Constants.LICENSE_TYPE_WINDOWS_CLIENT.equals(licenseType) || Constants.LICENSE_TYPE_WINDOWS_SERVER.equals(licenseType)) {
-            ArrayNode resources = (ArrayNode) template.get("resources");
-            for (JsonNode resource : resources) {
-                String type = resource.get("type").asText();
-                if (type.contains("virtualMachine")) {
-                    ObjectNode properties = (ObjectNode) resource.get("properties");
-                    properties.put("licenseType", licenseType);
-                    return;
-                }
+        ArrayNode resources = (ArrayNode) template.get("resources");
+        for (JsonNode resource : resources) {
+            String type = resource.get("type").asText();
+            if (type.contains("virtualMachine")) {
+                ObjectNode properties = (ObjectNode) resource.get("properties");
+                properties.put("licenseType", licenseType);
+                return;
             }
         }
     }

diff --git a/src/main/java/com/microsoft/azure/vmagent/util/Constants.java b/src/main/java/com/microsoft/azure/vmagent/util/Constants.java
@@ -90,7 +90,7 @@ public final class Constants {
     /**
      * Windows License Types.
      */
-    public static final String LICENSE_TYPE_CLASSIC = "Classic";
+    public static final String LICENSE_TYPE_NONE = "None";
 
     public static final String LICENSE_TYPE_WINDOWS_CLIENT = "Windows_Client";
 

diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/help-licenseType.html b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/help-licenseType.html
@@ -1,8 +1,16 @@
 <div>
-    For Windows agents, if you want to use <a href="https://learn.microsoft.com/en-us/azure/virtual-machines/windows/hybrid-use-benefit-licensing">Azure Hybrid Benefit</a>, then you can specify one of the following values:
+    <p>For Windows agents, if you want to use <a target="_blank"
+                                                 href="https://learn.microsoft.com/en-us/azure/virtual-machines/windows/hybrid-use-benefit-licensing">Azure
+        Hybrid Benefit</a>, then you can specify one of the following values:
+    </p>
     <ul>
         <li>Windows_Client</li>
         <li>Windows_Server</li>
     </ul>
-    Otherwise, leaving the value as <code>Classic</code> will not specify any license type.
+    <p>For Linux agents see <a target="_blank"
+                               href="https://learn.microsoft.com/en-us/azure/virtual-machines/linux/azure-hybrid-benefit-linux">Azure
+        Hybrid Benefit for Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) Virtual Machines</a>.
+    </p>
+
+    <p>Otherwise, leaving the value as <code>None</code> will not specify any license type.</p>
 </div>