Added integration test for vm deployment, UI enhancements for user persona, bug fixes

Author: sudo87

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

@@ -269,6 +269,7 @@ public class ApiConstants {
     public static final String INTERNAL_DNS2 = "internaldns2";
     public static final String INTERNET_PROTOCOL = "internetprotocol";
     public static final String INTERVAL_TYPE = "intervaltype";
+    public static final String INSTANCE_LEASE_ENABLED = "instanceleaseenabled";
     public static final String LOCATION_TYPE = "locationtype";
     public static final String IOPS_READ_RATE = "iopsreadrate";
     public static final String IOPS_READ_RATE_MAX = "iopsreadratemax";

api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java

@@ -72,6 +72,7 @@ public void execute() {
         response.setInstancesDisksStatsRetentionTime((Integer) capabilities.get(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME));
         response.setSharedFsVmMinCpuCount((Integer)capabilities.get(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT));
         response.setSharedFsVmMinRamSize((Integer)capabilities.get(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE));
+        response.setInstanceLeaseEnabled((Boolean) capabilities.get(ApiConstants.INSTANCE_LEASE_ENABLED));
         response.setObjectName("capability");
         response.setResponseName(getCommandName());
         this.setResponseObject(response);

api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java

@@ -136,6 +136,10 @@ public class CapabilitiesResponse extends BaseResponse {
     @Param(description = "the min Ram size for the service offering used by the shared filesystem instance", since = "4.20.0")
     private Integer sharedFsVmMinRamSize;
 
+    @SerializedName(ApiConstants.INSTANCE_LEASE_ENABLED)
+    @Param(description = "true if instance lease feature is enabled", since = "4.21.0")
+    private Boolean instanceLeaseEnabled;
+
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
         this.securityGroupsEnabled = securityGroupsEnabled;
     }
@@ -247,4 +251,8 @@ public void setSharedFsVmMinCpuCount(Integer sharedFsVmMinCpuCount) {
     public void setSharedFsVmMinRamSize(Integer sharedFsVmMinRamSize) {
         this.sharedFsVmMinRamSize = sharedFsVmMinRamSize;
     }
+
+    public void setInstanceLeaseEnabled(Boolean instanceLeaseEnabled) {
+        this.instanceLeaseEnabled = instanceLeaseEnabled;
+    }
 }

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -1478,10 +1478,14 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
             userVmSearchBuilder.join("tags", resourceTagSearch, resourceTagSearch.entity().getResourceId(), userVmSearchBuilder.entity().getId(), JoinBuilder.JoinType.INNER);
         }
 
-        if (VMLeaseManagerImpl.InstanceLeaseEnabled.value() && cmd.getOnlyLeasedInstances() != null && cmd.getOnlyLeasedInstances()) {
-            SearchBuilder<UserVmDetailVO> leasedInstancesSearch = userVmDetailsDao.createSearchBuilder();
-            leasedInstancesSearch.and(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE, leasedInstancesSearch.entity().getName(), SearchCriteria.Op.NNULL);
-            userVmSearchBuilder.join("userVmToLeased", leasedInstancesSearch, leasedInstancesSearch.entity().getResourceId(), userVmSearchBuilder.entity().getId(), JoinBuilder.JoinType.INNER);
+        if (cmd.getOnlyLeasedInstances() != null && cmd.getOnlyLeasedInstances()) {
+            if (VMLeaseManagerImpl.InstanceLeaseEnabled.value()) {
+                SearchBuilder<UserVmDetailVO> leasedInstancesSearch = userVmDetailsDao.createSearchBuilder();
+                leasedInstancesSearch.and(leasedInstancesSearch.entity().getName(), SearchCriteria.Op.EQ).values(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
+                userVmSearchBuilder.join("userVmToLeased", leasedInstancesSearch, leasedInstancesSearch.entity().getResourceId(), userVmSearchBuilder.entity().getId(), JoinBuilder.JoinType.INNER);
+            } else {
+                logger.warn("Lease feature is not enabled, onlyleasedinstances will be considered as false");
+            }
         }
 
         if (keyPairName != null) {

server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java

@@ -467,7 +467,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
         if (VMLeaseManagerImpl.InstanceLeaseEnabled.value() && userVm.getLeaseExpiryDate() != null) {
             userVmResponse.setLeaseExpiryAction(userVm.getLeaseExpiryAction());
             userVmResponse.setLeaseExpiryDate(userVm.getLeaseExpiryDate());
-            long leaseDuration = getLeaseDuration(userVm.getCreated(), userVm.getLeaseExpiryDate());
+            long leaseDuration = getLeaseDuration(new Date(), userVm.getLeaseExpiryDate());
             userVmResponse.setLeaseDuration(leaseDuration);
         }
 
@@ -484,7 +484,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
     private long getLeaseDuration(Date created, Date leaseExpiryDate) {
         LocalDate createdDate = created.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         LocalDate expiryDate = leaseExpiryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        return ChronoUnit.DAYS.between(createdDate, expiryDate) - 1;
+        return ChronoUnit.DAYS.between(createdDate, expiryDate);
     }
 
     private void addVnfInfoToserVmResponse(UserVmJoinVO userVm, UserVmResponse userVmResponse) {

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -638,6 +638,7 @@
 import org.apache.cloudstack.userdata.UserDataManager;
 import org.apache.cloudstack.utils.CloudStackVersion;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.cloudstack.vm.lease.VMLeaseManagerImpl;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -4496,6 +4497,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
         capabilities.put(ApiConstants.INSTANCES_STATS_USER_ONLY, StatsCollector.vmStatsCollectUserVMOnly.value());
         capabilities.put(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_ENABLED, StatsCollector.vmDiskStatsRetentionEnabled.value());
         capabilities.put(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME, StatsCollector.vmDiskStatsMaxRetentionTime.value());
+        capabilities.put(ApiConstants.INSTANCE_LEASE_ENABLED, VMLeaseManagerImpl.InstanceLeaseEnabled.value());
         if (apiLimitEnabled) {
             capabilities.put("apiLimitInterval", apiLimitInterval);
             capabilities.put("apiLimitMax", apiLimitMax);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -6297,19 +6297,6 @@ protected void validateLeaseProperties(Long leaseDuration, String leaseExpiryAct
         if (!bothValuesSet) {
             throw new InvalidParameterValueException("Provide values for both: leaseduration and leaseexpiryaction");
         }
-
-//        // at this point any one of them have value, error out
-//        if (leaseDuration == null || StringUtils.isEmpty(leaseExpiryAction)) {
-//            throw new InvalidParameterValueException("Provide values for both: leaseduration and leaseexpiryaction");
-//        }
-//
-//        // both params have value
-//        if (leaseDuration < -1) {
-//            throw new InvalidParameterValueException("Invalid value given for leaseduration, lesser than -1 is not supported ");
-//        }
-//        if (leaseDuration == -1 ) {
-//            return;
-//        }
         try {
             VMLeaseManager.ExpiryAction.valueOf(leaseExpiryAction);
         } catch (IllegalArgumentException e) {

server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java

@@ -133,6 +133,11 @@ protected void runInContext() {
     }
 
     protected void alert() {
+        // as feature is disabled, no action is required
+        if (!InstanceLeaseEnabled.value()) {
+            return;
+        }
+
         List<UserVmJoinVO> leaseExpiringForInstances = userVmJoinDao.listExpiringInstancesInDays(InstanceLeaseAlertStartsAt.value().intValue());
         for (UserVmJoinVO instance : leaseExpiringForInstances) {
             alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, instance.getDataCenterId(), instance.getPodId(),
@@ -142,6 +147,11 @@ protected void alert() {
 
     @Override
     public void poll(Date currentTimestamp) {
+        // as feature is disabled, no action is required
+        if (!InstanceLeaseEnabled.value()) {
+            return;
+        }
+
         GlobalLock scanLock = GlobalLock.getInternLock("VMLeaseScheduler");
         try {
             if (scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
@@ -157,11 +167,6 @@ public void poll(Date currentTimestamp) {
     }
 
     protected void reallyRun() {
-        // as feature is disabled, no action is required
-        if (!InstanceLeaseEnabled.value()) {
-            return;
-        }
-
         // fetch user_instances having leaseDuration configured and has expired
         List<UserVmJoinVO> leaseExpiredInstances = userVmJoinDao.listExpiredInstancesIds();
         List<Long> actionableInstanceIds = new ArrayList<>();