Skip to content

Commit ea2755a

Browse files
author
Hoang Nguyen
authored
Merge branch 'main' into feature/ui-tungsten-intergation
2 parents f3e0c31 + 1484f5a commit ea2755a

99 files changed

Lines changed: 1180 additions & 692 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ tools/cli/cloudmonkey/precache.py
4848
tools/marvin/marvin/cloudstackAPI/
4949
tools/marvin/build/
5050
tools/cli/build/
51+
tools/appliance/systemvmtemplate/packer_cache/
5152
*.jar
5253
*.war
5354
*.mar

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

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@
1616
// under the License.
1717
package com.cloud.agent;
1818

19+
import com.cloud.agent.Agent.ExitStatus;
20+
import com.cloud.agent.dao.StorageComponent;
21+
import com.cloud.agent.dao.impl.PropertiesStorage;
22+
import com.cloud.resource.ServerResource;
23+
import com.cloud.utils.LogUtils;
24+
import com.cloud.utils.NumbersUtil;
25+
import com.cloud.utils.ProcessUtil;
26+
import com.cloud.utils.PropertiesUtil;
27+
import com.cloud.utils.backoff.BackoffAlgorithm;
28+
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
29+
import com.cloud.utils.exception.CloudRuntimeException;
30+
import org.apache.commons.daemon.Daemon;
31+
import org.apache.commons.daemon.DaemonContext;
32+
import org.apache.commons.daemon.DaemonInitException;
33+
import org.apache.commons.lang.math.NumberUtils;
34+
import org.apache.commons.lang3.StringUtils;
35+
import org.apache.log4j.Logger;
36+
import org.apache.log4j.xml.DOMConfigurator;
37+
38+
import javax.naming.ConfigurationException;
1939
import java.io.File;
2040
import java.io.FileNotFoundException;
2141
import java.io.IOException;
@@ -30,28 +50,6 @@
3050
import java.util.Properties;
3151
import java.util.UUID;
3252

33-
import javax.naming.ConfigurationException;
34-
35-
import org.apache.commons.daemon.Daemon;
36-
import org.apache.commons.daemon.DaemonContext;
37-
import org.apache.commons.daemon.DaemonInitException;
38-
import org.apache.commons.lang.math.NumberUtils;
39-
import org.apache.commons.lang3.StringUtils;
40-
import org.apache.log4j.Logger;
41-
import org.apache.log4j.xml.DOMConfigurator;
42-
43-
import com.cloud.agent.Agent.ExitStatus;
44-
import com.cloud.agent.dao.StorageComponent;
45-
import com.cloud.agent.dao.impl.PropertiesStorage;
46-
import com.cloud.resource.ServerResource;
47-
import com.cloud.utils.LogUtils;
48-
import com.cloud.utils.NumbersUtil;
49-
import com.cloud.utils.ProcessUtil;
50-
import com.cloud.utils.PropertiesUtil;
51-
import com.cloud.utils.backoff.BackoffAlgorithm;
52-
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
53-
import com.cloud.utils.exception.CloudRuntimeException;
54-
5553
public class AgentShell implements IAgentShell, Daemon {
5654
private static final Logger s_logger = Logger.getLogger(AgentShell.class.getName());
5755

@@ -423,13 +421,13 @@ private void launchAgentFromClassInfo(String resourceClassNames) throws Configur
423421
} catch (final ClassNotFoundException e) {
424422
throw new ConfigurationException("Resource class not found: " + name + " due to: " + e.toString());
425423
} catch (final SecurityException e) {
426-
throw new ConfigurationException("Security excetion when loading resource: " + name + " due to: " + e.toString());
424+
throw new ConfigurationException("Security exception when loading resource: " + name + " due to: " + e.toString());
427425
} catch (final NoSuchMethodException e) {
428-
throw new ConfigurationException("Method not found excetion when loading resource: " + name + " due to: " + e.toString());
426+
throw new ConfigurationException("Method not found exception when loading resource: " + name + " due to: " + e.toString());
429427
} catch (final IllegalArgumentException e) {
430-
throw new ConfigurationException("Illegal argument excetion when loading resource: " + name + " due to: " + e.toString());
428+
throw new ConfigurationException("Illegal argument exception when loading resource: " + name + " due to: " + e.toString());
431429
} catch (final InstantiationException e) {
432-
throw new ConfigurationException("Instantiation excetion when loading resource: " + name + " due to: " + e.toString());
430+
throw new ConfigurationException("Instantiation exception when loading resource: " + name + " due to: " + e.toString());
433431
} catch (final IllegalAccessException e) {
434432
throw new ConfigurationException("Illegal access exception when loading resource: " + name + " due to: " + e.toString());
435433
} catch (final InvocationTargetException e) {

‎api/src/main/java/com/cloud/vm/VmDetailConstants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ public interface VmDetailConstants {
7373
String DISK_OFFERING = "diskOffering";
7474

7575
String DEPLOY_AS_IS_CONFIGURATION = "configurationId";
76+
String CKS_CONTROL_NODE_LOGIN_USER = "controlNodeLoginUser";
7677
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
4242
import com.cloud.utils.net.NetUtils;
4343

44-
@APICommand(name = "createLoadBalancer", description = "Creates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
44+
@APICommand(name = "createLoadBalancer", description = "Creates an internal load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
4545
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4646
public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
4747
public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName());

‎api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.cloud.event.EventTypes;
3434
import com.cloud.exception.InvalidParameterValueException;
3535

36-
@APICommand(name = "deleteLoadBalancer", description = "Deletes a load balancer", responseObject = SuccessResponse.class, since = "4.2.0",
36+
@APICommand(name = "deleteLoadBalancer", description = "Deletes an internal load balancer", responseObject = SuccessResponse.class, since = "4.2.0",
3737
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
3838
public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
3939
public static final Logger s_logger = Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName());

‎api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
3636
import com.cloud.utils.Pair;
3737

38-
@APICommand(name = "listLoadBalancers", description = "Lists load balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
38+
@APICommand(name = "listLoadBalancers", description = "Lists internal load balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
3939
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4040
public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd {
4141
public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName());

‎api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.cloud.exception.InvalidParameterValueException;
3232
import com.cloud.network.rules.FirewallRule;
3333

34-
@APICommand(name = "updateLoadBalancer", description = "Updates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0",
34+
@APICommand(name = "updateLoadBalancer", description = "Updates an internal load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0",
3535
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
3636
public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
3737
public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName());

‎api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public Map<String, String> getDetails() {
300300
}
301301
}
302302
}
303-
if (ApiConstants.BootType.UEFI.equals(getBootType())) {
303+
if (getBootType() != null) {
304304
customparameterMap.put(getBootType().toString(), getBootMode().toString());
305305
}
306306

‎api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ public class NetworkResponse extends BaseResponseWithAnnotations implements Cont
263263
@Param(description = "the total number of network traffic bytes sent")
264264
private Long bytesSent;
265265

266+
@SerializedName((ApiConstants.EGRESS_DEFAULT_POLICY))
267+
@Param(description = "true if guest network default egress policy is allow; false if default egress policy is deny")
268+
private Boolean egressDefaultPolicy;
269+
266270
public Boolean getDisplayNetwork() {
267271
return displayNetwork;
268272
}
@@ -528,4 +532,12 @@ public void setBytesReceived(Long bytesReceived) {
528532
public void setBytesSent(final Long bytesSent) {
529533
this.bytesSent = bytesSent;
530534
}
535+
536+
public boolean getEgressDefaultPolicy() {
537+
return egressDefaultPolicy;
538+
}
539+
540+
public void setEgressDefaultPolicy(Boolean egressDefaultPolicy) {
541+
this.egressDefaultPolicy = egressDefaultPolicy;
542+
}
531543
}

‎engine/components-api/src/main/java/com/cloud/hypervisor/HypervisorGuruManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ public interface HypervisorGuruManager extends Manager {
2424
HypervisorGuru getGuru(HypervisorType hypervisorType);
2525

2626
long getGuruProcessedCommandTargetHost(long hostId, Command cmd);
27+
28+
long getGuruProcessedCommandTargetHost(long hostId, Command cmd, HypervisorType hypervisorType);
2729
}

0 commit comments

Comments
 (0)