Merge branch 'main' of https://github.com/apache/cloudstack into HEAD

Author: Pearl1594

.travis.yml

@@ -64,7 +64,7 @@ env:
              smoke/test_dynamicroles
              smoke/test_global_settings
              smoke/test_guest_vlan_range
-             smoke/test_host_annotations
+             smoke/test_annotations
              smoke/test_host_maintenance
              smoke/test_hostha_simulator"
 
@@ -88,6 +88,7 @@ env:
              smoke/test_portable_publicip
              smoke/test_portforwardingrules
              smoke/test_privategw_acl
+             smoke/test_privategw_acl_ovs_gre
              smoke/test_projects
              smoke/test_public_ip_range"
 

README.md

@@ -1,4 +1,4 @@
-# Apache CloudStack [![Build Status](https://travis-ci.org/apache/cloudstack.svg?branch=main)](https://travis-ci.org/apache/cloudstack) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apachecloudstack) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=ncloc)](https://sonarcloud.io/dashboard?id=apachecloudstack) ![GitHub language count](https://img.shields.io/github/languages/count/apache/cloudstack.svg) ![GitHub top language](https://img.shields.io/github/languages/top/apache/cloudstack.svg)
+# Apache CloudStack [![Build Status](https://app.travis-ci.com/apache/cloudstack.svg?branch=main)](https://app.travis-ci.com/apache/cloudstack) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apachecloudstack) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=ncloc)](https://sonarcloud.io/dashboard?id=apachecloudstack) ![GitHub language count](https://img.shields.io/github/languages/count/apache/cloudstack.svg) ![GitHub top language](https://img.shields.io/github/languages/top/apache/cloudstack.svg)
 
 ![Apache CloudStack](tools/logo/apache_cloudstack.png)
 
@@ -143,5 +143,5 @@ The following provides more details on the included cryptographic software:
 * CloudStack makes use of JaSypt cryptographic libraries.
 * CloudStack has a system requirement of MySQL, and uses native database encryption functionality.
 * CloudStack makes use of the Bouncy Castle general-purpose encryption library.
-* CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
+* CloudStack can optionally interact with and control OpenSwan-based VPNs.
 * CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.

agent/conf/agent.properties

@@ -97,6 +97,12 @@ domr.scripts.dir=scripts/network/domr/kvm
 # migration will finish quickly.  Less than 1 means disabled.
 #vm.migrate.pauseafter=0
 
+# Time (in seconds) to wait for VM migrate finish. Less than 1 means disabled.
+# If vm migration is not finished in the time, the vm job will be cancelled by libvirt.
+# It will be configured by cloudstack management server when cloudstack agent connects.
+# please change the global setting 'migratewait' if needed (default value: 3600)
+#vm.migrate.wait=0
+
 # Agent hooks is the way to override default agent behavior to extend the functionality without excessive coding
 # for a custom deployment. The first hook promoted is libvirt-vm-xml-transformer which allows provider to modify
 # VM XML specification before send to libvirt. Hooks are implemented in Groovy and must be implemented in the way
@@ -270,3 +276,12 @@ iscsi.session.cleanup.enabled=false
 # This parameter specifies the heartbeat update timeout in ms; The default value is 60000ms (1 min).
 # Depending on the use case, this timeout might need increasing/decreasing.
 # heartbeat.update.timeout=60000
+
+# This parameter specifies the timeout in seconds to retrieve the target's domain id when migrating a VM with KVM.
+# vm.migrate.domain.retrieve.timeout=10
+
+# This parameter specifies if the host must be rebooted when something goes wrong with the heartbeat.
+# reboot.host.and.alert.management.on.heartbeat.timeout=true
+
+# Enable manually setting CPU's topology on KVM's VM.
+# enable.manually.setting.cpu.topology.on.kvm.vm=true

agent/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.16.0.0-SNAPSHOT</version>
+        <version>4.17.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

agent/src/main/java/com/cloud/agent/Agent.java

@@ -51,6 +51,7 @@
 import org.apache.cloudstack.utils.security.KeyStoreUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 
@@ -72,7 +73,6 @@
 import com.cloud.host.Host;
 import com.cloud.resource.ServerResource;
 import com.cloud.utils.PropertiesUtil;
-import com.cloud.utils.StringUtils;
 import com.cloud.utils.backoff.BackoffAlgorithm;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -85,7 +85,6 @@
 import com.cloud.utils.nio.Task;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
-import com.google.common.base.Strings;
 
 /**
  * @config
@@ -715,7 +714,7 @@ public Answer setupAgentKeystore(final SetupKeyStoreCommand cmd) {
         final String csrFile = agentFile.getParent() + "/" + KeyStoreUtils.CSR_FILENAME;
 
         String storedPassword = _shell.getPersistentProperty(null, KeyStoreUtils.KS_PASSPHRASE_PROPERTY);
-        if (Strings.isNullOrEmpty(storedPassword)) {
+        if (StringUtils.isEmpty(storedPassword)) {
             storedPassword = keyStorePassword;
             _shell.setPersistentProperty(null, KeyStoreUtils.KS_PASSPHRASE_PROPERTY, storedPassword);
         }
@@ -782,9 +781,9 @@ private Answer setupAgentCertificate(final SetupCertificateCommand cmd) {
     }
 
     private void processManagementServerList(final List<String> msList, final String lbAlgorithm, final Long lbCheckInterval) {
-        if (CollectionUtils.isNotEmpty(msList) && !Strings.isNullOrEmpty(lbAlgorithm)) {
+        if (CollectionUtils.isNotEmpty(msList) && StringUtils.isNotEmpty(lbAlgorithm)) {
             try {
-                final String newMSHosts = String.format("%s%s%s", StringUtils.toCSVList(msList), IAgentShell.hostLbAlgorithmSeparator, lbAlgorithm);
+                final String newMSHosts = String.format("%s%s%s", com.cloud.utils.StringUtils.toCSVList(msList), IAgentShell.hostLbAlgorithmSeparator, lbAlgorithm);
                 _shell.setPersistentProperty(null, "host", newMSHosts);
                 _shell.setHosts(newMSHosts);
                 _shell.resetHostCounter();

agent/src/main/java/com/cloud/agent/AgentShell.java

@@ -36,6 +36,7 @@
 import org.apache.commons.daemon.DaemonContext;
 import org.apache.commons.daemon.DaemonInitException;
 import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
 
@@ -50,7 +51,6 @@
 import com.cloud.utils.backoff.BackoffAlgorithm;
 import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.google.common.base.Strings;
 
 public class AgentShell implements IAgentShell, Daemon {
     private static final Logger s_logger = Logger.getLogger(AgentShell.class.getName());
@@ -155,7 +155,7 @@ public String[] getHosts() {
 
     @Override
     public void setHosts(final String host) {
-        if (!Strings.isNullOrEmpty(host)) {
+        if (StringUtils.isNotEmpty(host)) {
             _host = host.split(hostLbAlgorithmSeparator)[0];
             resetHostCounter();
         }
@@ -333,7 +333,7 @@ protected boolean parseCommand(final String[] args) throws ConfigurationExceptio
         }
 
         String val = getProperty(null, preferredHostIntervalKey);
-        preferredHostCheckInterval = (Strings.isNullOrEmpty(val) ? null : Long.valueOf(val));
+        preferredHostCheckInterval = StringUtils.isEmpty(val) ? null : Long.valueOf(val);
 
         return true;
     }

agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java

@@ -20,7 +20,7 @@
 
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.utils.security.DigestHelper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.io.File;

agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java

@@ -22,7 +22,7 @@
 import com.cloud.utils.UriUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.io.File;

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -29,9 +29,31 @@ public class AgentProperties{
      * Heartbeat update timeout. <br>
      * Data type: int. <br>
      * Default value: 60000 (ms).
-    */
+     */
     public static final Property<Integer> HEARTBEAT_UPDATE_TIMEOUT = new Property<Integer>("heartbeat.update.timeout", 60000);
 
+    /**
+     * The timeout in seconds to retrieve the target's domain id when migrating a VM with KVM. <br>
+     * Data type: int. <br>
+     * Default value: 10 (sec).
+     */
+    public static final Property<Integer> VM_MIGRATE_DOMAIN_RETRIEVE_TIMEOUT = new Property<Integer>("vm.migrate.domain.retrieve.timeout", 10);
+
+    /**
+     * Reboot host and alert management on heartbeat timeout. <br>
+     * Data type: boolean.<br>
+     * Default value: true.
+     */
+    public static final Property<Boolean> REBOOT_HOST_AND_ALERT_MANAGEMENT_ON_HEARTBEAT_TIMEOUT
+        = new Property<Boolean>("reboot.host.and.alert.management.on.heartbeat.timeout", true);
+
+    /**
+     * Enable manually setting CPU's topology on KVM's VM. <br>
+     * Data type: boolean.<br>
+     * Default value: true.
+     */
+    public static final Property<Boolean> ENABLE_MANUALLY_SETTING_CPU_TOPOLOGY_ON_KVM_VM = new Property<Boolean>("enable.manually.setting.cpu.topology.on.kvm.vm", true);
+
     public static class Property <T>{
         private final String name;
         private final T defaultValue;

api/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.16.0.0-SNAPSHOT</version>
+        <version>4.17.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>