apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.20 to main

Browse Source 
* 4.20:
  Rollback of changes with errors during the VM assign (#7061)
  [VMware] Consider CD/DVD drive when calculating next free unit number for volume attachment over IDE controller (#9644)
  consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)
This commit is contained in:
Daan Hoogland 2025-01-15 17:52:07 +01:00
commit 0c13ded943
7 changed files with 2260 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/vm/UserVmService.java
View File

@ -469,7 +469,7 @@ public interface UserVmService {
VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map<String, String> volumeToPool) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException,
UserVm moveVmToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException;
VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool);

21
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
View File

@ -120,29 +120,18 @@ public class AssignVMCmd extends BaseCmd {
@Override
public void execute() {
try {
UserVm userVm = _userVmService.moveVMToUser(this);
if (userVm == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
}
UserVm userVm = _userVmService.moveVmToUser(this);
UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", userVm).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} catch (InvalidParameterValueException e){
e.printStackTrace();
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
} catch (Exception e) {
logger.error("Failed to move vm due to: " + e.getStackTrace());
if (e.getMessage() != null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getMessage());
} else if (e.getCause() != null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getCause());
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
ApiErrorCode errorCode = e instanceof InvalidParameterValueException ? ApiErrorCode.PARAM_ERROR : ApiErrorCode.INTERNAL_ERROR;
String msg = String.format("Failed to move VM [%s].", getVmId());
logger.error(msg, e);
throw new ServerApiException(errorCode, msg);
}
}
}
@Override
public long getEntityOwnerId() {
UserVm vm = _responseGenerator.findUserVmById(getVmId());

1109
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

File diff suppressed because it is too large Load Diff

1533
server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
View File

File diff suppressed because it is too large Load Diff

4
server/src/test/java/com/cloud/vm/UserVmManagerTest.java
View File

@ -477,7 +477,7 @@ public class UserVmManagerTest {
CallContext.register(user, caller);
try {
_userVmMgr.moveVMToUser(cmd);
_userVmMgr.moveVmToUser(cmd);
} finally {
CallContext.unregister();
}
@ -527,7 +527,7 @@ public class UserVmManagerTest {
when(_accountMgr.isRootAdmin(anyLong())).thenReturn(true);
try {
_userVmMgr.moveVMToUser(cmd);
_userVmMgr.moveVmToUser(cmd);
} finally {
CallContext.unregister();
}

9
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View File

@ -400,10 +400,13 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
}
String[] cidrs = _allowedInternalSites.split(",");
for (String cidr : cidrs) {
if (NetUtils.isValidIp4Cidr(cidr) || NetUtils.isValidIp4(cidr) || !cidr.startsWith("0.0.0.0")) {
if (NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
logger.warn(String.format("Invalid CIDR %s in %s", cidr, SecStorageAllowedInternalDownloadSites.key()));
if (NetUtils.isValidIp4Cidr(cidr) && !cidr.startsWith("0.0.0.0")) {
if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
logger.warn("Invalid CIDR {} in {}", cidr, SecStorageAllowedInternalDownloadSites.key());
}
allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
} else if (NetUtils.isValidIp4(cidr) && !cidr.startsWith("0.0.0.0")) {
logger.warn("Ip address is not a valid CIDR; {} consider using {}/32", cidr, cidr);
allowedCidrs.add(cidr);
}
}

7
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -3168,9 +3168,12 @@ public class VirtualMachineMO extends BaseMO {
int deviceCount = 0;
int ideDeviceUnitNumber = -1;
if (devices != null && devices.size() > 0) {
if (devices != null) {
for (VirtualDevice device : devices) {
if (device instanceof VirtualDisk && (controllerKey == device.getControllerKey())) {
if (device.getControllerKey() == null || device.getControllerKey() != controllerKey) {
continue;
}
if (device instanceof VirtualDisk || device instanceof VirtualCdrom) {
deviceCount++;
ideDeviceUnitNumber = device.getUnitNumber();
}