handle review comment and merge main

Author: sudo87

.pre-commit-config.yaml

@@ -48,6 +48,7 @@ repos:
         exclude: >
           (?x)
           ^scripts/vm/systemvm/id_rsa\.cloud$|
+          ^server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java$|
           ^server/src/test/java/com/cloud/keystore/KeystoreTest\.java$|
           ^server/src/test/resources/certs/dsa_self_signed\.key$|
           ^server/src/test/resources/certs/non_root\.key$|
@@ -57,7 +58,8 @@ repos:
           ^server/src/test/resources/certs/rsa_self_signed\.key$|
           ^services/console-proxy/rdpconsole/src/test/doc/rdp-key\.pem$|
           ^systemvm/agent/certs/localhost\.key$|
-          ^systemvm/agent/certs/realhostip\.key$
+          ^systemvm/agent/certs/realhostip\.key$|
+          ^test/integration/smoke/test_ssl_offloading.py$
       - id: end-of-file-fixer
         exclude: \.vhd$
       - id: fix-byte-order-marker
@@ -75,7 +77,7 @@ repos:
         name: run codespell
         description: Check spelling with codespell
         args: [--ignore-words=.github/linters/codespell.txt]
-        exclude: ^systemvm/agent/noVNC/|^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$
+        exclude: ^systemvm/agent/noVNC/|^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$|^server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java$|^test/integration/smoke/test_ssl_offloading.py$
   - repo: https://github.com/pycqa/flake8
     rev: 7.0.0
     hooks:

api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java

@@ -71,7 +71,7 @@ public LoadBalancerTO(String uuid, String srcIp, int srcPort, String protocol, S
         this.destinations = new DestinationTO[destinations.size()];
         this.stickinessPolicies = null;
         this.sslCert = null;
-        this.lbProtocol = null;
+        this.lbProtocol = protocol;
         int i = 0;
         for (LbDestination destination : destinations) {
             this.destinations[i++] = new DestinationTO(destination.getIpAddress(), destination.getDestinationPortStart(), destination.isRevoked(), false);
@@ -205,6 +205,10 @@ public LbSslCert getSslCert() {
         return this.sslCert;
     }
 
+    public void setLbSslCert(LbSslCert sslCert) {
+        this.sslCert = sslCert;
+    }
+
     public String getSrcIpVlan() {
         return srcIpVlan;
     }

api/src/main/java/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java

@@ -35,10 +35,10 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.SNAPSHOT_POLICY_ID, type = CommandType.LONG, description = "Lists recurring Snapshots by Snapshot policy ID")
+    @Parameter(name = ApiConstants.SNAPSHOT_POLICY_ID, type = CommandType.LONG, description = "Lists recurring snapshots by Snapshot policy ID")
     private Long snapshotPolicyId;
 
-    @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.LONG, required = true, description = "List recurring Snapshots by volume ID")
+    @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.LONG, required = true, description = "List recurring snapshots by volume ID")
     private Long volumeId;
 
     /////////////////////////////////////////////////////

api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java

@@ -106,7 +106,7 @@ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String descri
 
     boolean applyLoadBalancerConfig(long lbRuleId) throws ResourceUnavailableException;
 
-    boolean assignCertToLoadBalancer(long lbRuleId, Long certId);
+    boolean assignCertToLoadBalancer(long lbRuleId, Long certId, boolean isForced);
 
     boolean removeCertFromLoadBalancer(long lbRuleId);
 

api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java

@@ -58,7 +58,7 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
     private String domainName;
 
     @SerializedName(ApiConstants.DOMAIN_PATH)
-    @Param(description = "path of the Domain the affinity group belongs to", since = "4.19.2.0")
+    @Param(description = "Path of the Domain the affinity group belongs to", since = "4.19.2.0")
     private String domainPath;
 
     @SerializedName(ApiConstants.PROJECT_ID)

api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java

@@ -52,7 +52,7 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
     private Long osTypeId;
 
     @Parameter(name = ApiConstants.FORCE_UPDATE_OS_TYPE, type = CommandType.BOOLEAN, since = "4.21", description = "Force OS type update. Warning: Updating OS type will " +
-            "Update the guest OS configuration for all the existing Instances deployed with this template/iso, which may affect their behavior.")
+            "Update the guest OS configuration for all the existing Instances deployed with this Template/ISO, which may affect their behavior.")
     private Boolean forceUpdateOsType;
 
     @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, description = "The format for the image")

api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java

@@ -83,7 +83,7 @@ public void execute() {
         if (getRoleId() != null) {
             Role existingRole = roleService.findRole(getRoleId());
             if (existingRole == null) {
-                throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid role id provided");
+                throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid role ID provided");
             }
 
             CallContext.current().setEventDetails("Role: " + getRoleName() + ", from role: " + getRoleId() + ", description: " + getRoleDescription());
@@ -101,15 +101,15 @@ public void execute() {
 
     private void validateRoleParameters() {
         if (getRoleType() == null && getRoleId() == null) {
-            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Neither role type nor role id is provided");
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Neither role type nor role ID is provided");
         }
 
         if (getRoleType() != null && getRoleId() != null) {
-            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Both role type and role id should not be specified");
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Both role type and role ID should not be specified");
         }
 
         if (getRoleId() != null && getRoleId() < 1L) {
-            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid role id provided");
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid role ID provided");
         }
     }
 

api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java

@@ -44,7 +44,7 @@ public class AddAnnotationCmd extends BaseCmd {
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "The following entity types are allowed VM, VOLUME, SNAPSHOT, VM_SNAPSHOT, INSTANCE_GROUP, SSH_KEYPAIR, USER_DATA, NETWORK, VPC, PUBLIC_IP_ADDRESS, VPN_CUSTOMER_GATEWAY, TEMPLATE, ISO, KUBERNETES_CLUSTER, SERVICE_OFFERING, DISK_OFFERING, NETWORK_OFFERING, ZONE, POD, CLUSTER, HOST, DOMAIN, PRIMARY_STORAGE, SECONDARY_STORAGE, VR, SYSTEM_VM, AUTOSCALE_VM_GROUP, MANAGEMENT_SERVER")
     private String entityType;
 
-    @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "The id of the entity to annotate")
+    @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "The ID of the entity to annotate")
     private String entityUuid;
 
     @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN, since = "4.16.0",

api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java

@@ -37,17 +37,17 @@
 public class ListAnnotationsCmd extends BaseListCmd {
 
 
-    @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "The id of the annotation")
+    @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "The ID of the annotation")
     private String uuid;
 
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "The entity type")
     private String entityType;
 
-    @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "The id of the entity for which to show annotations")
+    @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "The ID of the entity for which to show annotations")
     private String entityUuid;
 
     @Parameter(name = ApiConstants.USER_ID, type = CommandType.STRING, since = "4.16.0",
-            description = "Optional: The id of the user of the annotation", required = false)
+            description = "Optional: The ID of the user of the annotation", required = false)
     private String userUuid;
 
     @Parameter(name = ApiConstants.ANNOTATION_FILTER,

api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java

@@ -38,7 +38,7 @@ public class UpdateAnnotationVisibilityCmd extends BaseCmd {
 
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true,
-            description = "The id of the annotation")
+            description = "The ID of the annotation")
     private String uuid;
 
     @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN, required = true,