Skip to content

Commit beb16d7

Browse files
author
utchoang
committed
Merge branch '4.15' into feature/multiple-server
2 parents e3a9d47 + 3ee5639 commit beb16d7

231 files changed

Lines changed: 6356 additions & 3119 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.

‎api/src/main/java/com/cloud/agent/api/Command.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public static enum OnError {
3737
@LogLevel(Log4jLevel.Trace)
3838
protected Map<String, String> contextMap = new HashMap<String, String>();
3939
private int wait; //in second
40+
private boolean bypassHostMaintenance = false;
4041

4142
protected Command() {
4243
this.wait = 0;
@@ -74,6 +75,14 @@ public boolean allowCaching() {
7475
return true;
7576
}
7677

78+
public boolean isBypassHostMaintenance() {
79+
return bypassHostMaintenance;
80+
}
81+
82+
public void setBypassHostMaintenance(boolean bypassHostMaintenance) {
83+
this.bypassHostMaintenance = bypassHostMaintenance;
84+
}
85+
7786
@Override
7887
public boolean equals(Object o) {
7988
if (this == o) return true;

‎api/src/main/java/com/cloud/event/EventTypes.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ public class EventTypes {
374374
// Primary storage pool
375375
public static final String EVENT_ENABLE_PRIMARY_STORAGE = "ENABLE.PS";
376376
public static final String EVENT_DISABLE_PRIMARY_STORAGE = "DISABLE.PS";
377+
public static final String EVENT_SYNC_STORAGE_POOL = "SYNC.STORAGE.POOL";
377378

378379
// VPN
379380
public static final String EVENT_REMOTE_ACCESS_VPN_CREATE = "VPN.REMOTE.ACCESS.CREATE";

‎api/src/main/java/com/cloud/host/Status.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ public static String[] toStrings(Status... states) {
131131
s_fsm.addTransition(Status.Up, Event.PingTimeout, Status.Alert);
132132
s_fsm.addTransition(Status.Up, Event.AgentDisconnected, Status.Alert);
133133
s_fsm.addTransition(Status.Up, Event.ShutdownRequested, Status.Disconnected);
134+
s_fsm.addTransition(Status.Disconnected, Event.ShutdownRequested, Status.Disconnected);
135+
s_fsm.addTransition(Status.Down, Event.ShutdownRequested, Status.Disconnected);
136+
s_fsm.addTransition(Status.Rebalancing, Event.ShutdownRequested, Status.Disconnected);
134137
s_fsm.addTransition(Status.Up, Event.HostDown, Status.Down);
135138
s_fsm.addTransition(Status.Up, Event.Ping, Status.Up);
136139
s_fsm.addTransition(Status.Up, Event.AgentConnected, Status.Connecting);

‎api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,9 @@ public interface Site2SiteCustomerGateway extends ControlledEntity, Identity, In
4343

4444
public Date getRemoved();
4545

46+
public Boolean getSplitConnections();
47+
48+
public String getIkeVersion();
49+
4650
String getName();
4751
}

‎api/src/main/java/com/cloud/resource/ResourceState.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public static boolean canAttemptMaintenance(ResourceState state) {
114114
s_fsm.addTransition(ResourceState.Enabled, Event.Disable, ResourceState.Disabled);
115115
s_fsm.addTransition(ResourceState.Enabled, Event.AdminAskMaintenance, ResourceState.PrepareForMaintenance);
116116
s_fsm.addTransition(ResourceState.Enabled, Event.InternalEnterMaintenance, ResourceState.Maintenance);
117+
s_fsm.addTransition(ResourceState.Enabled, Event.DeleteHost, ResourceState.Disabled);
117118
s_fsm.addTransition(ResourceState.Disabled, Event.Enable, ResourceState.Enabled);
118119
s_fsm.addTransition(ResourceState.Disabled, Event.Disable, ResourceState.Disabled);
119120
s_fsm.addTransition(ResourceState.Disabled, Event.InternalCreated, ResourceState.Disabled);

‎api/src/main/java/com/cloud/storage/StorageService.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.cloudstack.api.command.admin.storage.DeletePoolCmd;
2828
import org.apache.cloudstack.api.command.admin.storage.DeleteSecondaryStagingStoreCmd;
2929
import org.apache.cloudstack.api.command.admin.storage.UpdateStoragePoolCmd;
30+
import org.apache.cloudstack.api.command.admin.storage.SyncStoragePoolCmd;
3031

3132
import com.cloud.exception.DiscoveryException;
3233
import com.cloud.exception.InsufficientCapacityException;
@@ -104,4 +105,6 @@ public interface StorageService {
104105

105106
ImageStore updateImageStoreStatus(Long id, Boolean readonly);
106107

108+
StoragePool syncStoragePool(SyncStoragePoolCmd cmd);
109+
107110
}

‎api/src/main/java/com/cloud/template/TemplateApiService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public interface TemplateApiService {
5656

5757
VirtualMachineTemplate prepareTemplate(long templateId, long zoneId, Long storageId);
5858

59-
boolean detachIso(long vmId);
59+
boolean detachIso(long vmId, boolean forced);
6060

61-
boolean attachIso(long isoId, long vmId);
61+
boolean attachIso(long isoId, long vmId, boolean forced);
6262

6363
/**
6464
* Deletes a template

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.Date;
2121
import java.util.List;
2222
import java.util.Map;
23+
import java.util.Set;
24+
import java.util.HashSet;
2325

2426
import org.apache.cloudstack.acl.ControlledEntity;
2527
import org.apache.cloudstack.api.Displayable;
@@ -186,6 +188,7 @@ public static boolean isVmDestroyed(State oldState, Event e, State newState) {
186188
}
187189
}
188190

191+
static final Set<Type> systemVMs = new HashSet<>(Arrays.asList(VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm));
189192
static final String IsDynamicScalingEnabled = "enable.dynamic.scaling";
190193

191194
public enum Event {

‎api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public String getDescription() {
5959
s_fsm.addTransition(Error, Event.ExpungeRequested, Expunging);
6060
s_fsm.addTransition(Expunging, Event.ExpungeRequested, Expunging);
6161
s_fsm.addTransition(Expunging, Event.OperationSucceeded, Removed);
62+
s_fsm.addTransition(Expunging, Event.OperationFailed, Error);
6263
}
6364
}
6465

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,12 +629,14 @@ public class ApiConstants {
629629
public static final String GUEST_IP = "guestip";
630630
public static final String REMOVED = "removed";
631631
public static final String COMPLETED = "completed";
632+
public static final String IKE_VERSION = "ikeversion";
632633
public static final String IKE_POLICY = "ikepolicy";
633634
public static final String ESP_POLICY = "esppolicy";
634635
public static final String IKE_LIFETIME = "ikelifetime";
635636
public static final String ESP_LIFETIME = "esplifetime";
636637
public static final String DPD = "dpd";
637638
public static final String FORCE_ENCAP = "forceencap";
639+
public static final String SPLIT_CONNECTIONS = "splitconnections";
638640
public static final String FOR_VPC = "forvpc";
639641
public static final String SHRINK_OK = "shrinkok";
640642
public static final String NICIRA_NVP_DEVICE_ID = "nvpdeviceid";

0 commit comments

Comments
 (0)