Merge branch 'ablecloud-team:ablestack-europa' into ablestack-europa

Author: sjyu1

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

@@ -1414,6 +1414,10 @@ public class ApiConstants {
     public static final String LISTHOSTDEVICES = "listhostdevices";
     public static final String HOSTDEVICES_NAME = "hostdevicesname";
     public static final String HOSTDEVICES_TEXT = "hostdevicestext";
+    public static final String HOSTDEVICES_TYPE = "hostdevicestype";
+    public static final String DEVICE_TYPE = "devicetype";
+    public static final String LUN_PATH_MODE = "lunpathmode";
+
     // Object Storage related
     public static final String BUCKET_AVAILABLE = "bucketavailable";
     public static final String BUCKET_LIMIT = "bucketlimit";
@@ -1423,8 +1427,6 @@ public class ApiConstants {
     public static final String OBJECT_STORAGE_AVAILABLE = "objectstorageavailable";
     public static final String OBJECT_STORAGE_LIMIT = "objectstoragelimit";
     public static final String OBJECT_STORAGE_TOTAL = "objectstoragetotal";
-    public static final String HOSTDEVICES_TYPE = "hostdevicestype";
-    public static final String DEVICE_TYPE = "devicetype";
 
     public static final String PARAMETER_DESCRIPTION_ACTIVATION_RULE = "Quota tariff's activation rule. It can receive a JS script that results in either " +
             "a boolean or a numeric value: if it results in a boolean value, the tariff value will be applied according to the result; if it results in a numeric value, the " +

api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ListHostLunDevicesCmd.java

@@ -24,8 +24,8 @@
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListHostLunDevicesResponse;
-import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.context.CallContext;
 
 
 
@@ -42,6 +42,9 @@ public class ListHostLunDevicesCmd extends BaseListCmd {
             ApiArgValidator.PositiveNumber })
     private Long id;
 
+    @Parameter(name = ApiConstants.LUN_PATH_MODE, type = BaseCmd.CommandType.STRING, description = "LUN listing: single (paths not in multipath -ll) or multipath (dm/mpath from multipath -ll)")
+    private String lunPathMode;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////a
     /////////////////////////////////////////////////////
@@ -50,6 +53,14 @@ public Long getId() {
         return id;
     }
 
+    public String getLunPathMode() {
+        return lunPathMode;
+    }
+
+    public void setLunPathMode(String lunPathMode) {
+        this.lunPathMode = lunPathMode;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

core/src/main/java/com/cloud/agent/api/ListHostLunDeviceCommand.java

@@ -23,12 +23,23 @@
 
 public class ListHostLunDeviceCommand extends Command {
 
+    public static final String MODE_SINGLE = "single";
+    public static final String MODE_MULTIPATH = "multipath";
+
     private final Long id;
+    private String lunPathMode = MODE_SINGLE;
     private List<String> hostDevicesName;
     private List<String> hostDevicesText;
 
     public ListHostLunDeviceCommand(Long id) {
+        this(id, MODE_SINGLE);
+    }
+
+    public ListHostLunDeviceCommand(Long id, String lunPathMode) {
         this.id = id;
+        if (lunPathMode != null && !lunPathMode.trim().isEmpty()) {
+            this.lunPathMode = lunPathMode.trim().toLowerCase();
+        }
     }
 
     @Override
@@ -40,6 +51,16 @@ public Long getId() {
         return id;
     }
 
+    public String getLunPathMode() {
+        return lunPathMode;
+    }
+
+    public void setLunPathMode(String lunPathMode) {
+        if (lunPathMode != null && !lunPathMode.trim().isEmpty()) {
+            this.lunPathMode = lunPathMode.trim().toLowerCase();
+        }
+    }
+
     public List<String> getHostDevicesName() {
         return hostDevicesName;
     }

core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java

@@ -36,6 +36,9 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
     public String lbStatsAuth = "admin1:AdMiN123";
     public String lbStatsUri = "/admin?stats";
     public String maxconn = "";
+    public String lbConnectTimeout = "5000";
+    public String lbClientTimeout = "50000";
+    public String lbServerTimeout = "50000";
     public String lbProtocol;
     public boolean keepAliveEnabled = false;
     NicTO nic;

core/src/main/java/com/cloud/network/HAProxyConfigurator.java

@@ -46,6 +46,9 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
 
     protected Logger logger = LogManager.getLogger(getClass());
     private static final String blankLine = "\t ";
+    private static final String defaultConnectTimeout = "5000";
+    private static final String defaultClientTimeout = "50000";
+    private static final String defaultServerTimeout = "50000";
     private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914   local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy",
         "\tuser haproxy", "\tgroup haproxy", "\tstats socket /run/haproxy/admin.sock", "\tdaemon"};
 
@@ -82,7 +85,7 @@ public String[] generateConfiguration(final List<PortForwardingRuleTO> fwRules)
 
         result.addAll(Arrays.asList(globalSection));
         result.add(blankLine);
-        result.addAll(Arrays.asList(defaultsSection));
+        result.addAll(getDefaultsSection(defaultConnectTimeout, defaultClientTimeout, defaultServerTimeout, false));
         result.add(blankLine);
 
         if (pools.isEmpty()) {
@@ -631,10 +634,7 @@ public String[] generateConfiguration(final LoadBalancerConfigCommand lbCmd) {
         result.addAll(gSection);
 
         result.add(blankLine);
-        final List<String> dSection = Arrays.asList(defaultsSection);
-        if (lbCmd.keepAliveEnabled) {
-            dSection.set(7, "\tno option httpclose");
-        }
+        final List<String> dSection = getDefaultsSection(lbCmd.lbConnectTimeout, lbCmd.lbClientTimeout, lbCmd.lbServerTimeout, lbCmd.keepAliveEnabled);
 
         if (logger.isDebugEnabled()) {
             for (final String s : dSection) {
@@ -751,4 +751,18 @@ private void addSslCertEntry(Set<SslCertEntry> sslCertEntries, LoadBalancerTO lb
         final SslCertEntry sslCertEntry = new SslCertEntry(name, cert.getCert(), cert.getKey(), cert.getChain(), cert.getPassword());
         sslCertEntries.add(sslCertEntry);
     }
+
+    private List<String> getDefaultsSection(final String connectTimeout, final String clientTimeout, final String serverTimeout, final boolean keepAliveEnabled) {
+        final List<String> dSection = new ArrayList<>(Arrays.asList(defaultsSection));
+        final String effectiveConnectTimeout = StringUtils.isBlank(connectTimeout) ? defaultConnectTimeout : connectTimeout;
+        final String effectiveClientTimeout = StringUtils.isBlank(clientTimeout) ? defaultClientTimeout : clientTimeout;
+        final String effectiveServerTimeout = StringUtils.isBlank(serverTimeout) ? defaultServerTimeout : serverTimeout;
+        dSection.set(8, "\ttimeout connect    " + effectiveConnectTimeout);
+        dSection.set(9, "\ttimeout client     " + effectiveClientTimeout);
+        dSection.set(10, "\ttimeout server     " + effectiveServerTimeout);
+        if (keepAliveEnabled) {
+            dSection.set(7, "\tno option httpclose");
+        }
+        return dSection;
+    }
 }