etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

standardize events and fix rebase errors

This commit is contained in:
erikbocks 2026-01-22 09:26:01 -03:00
parent 6f16482165
commit b419a77fd8
31 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ExecuteClusterDrsPlanCmd.java
View File

@ -142,6 +142,6 @@ public class ExecuteClusterDrsPlanCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return String.format("Executing DRS plan for cluster: %d", getResourceUuid(ApiConstants.ID));
return "Executing DRS plan for cluster with ID: " + getResourceUuid(ApiConstants.ID);
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
View File

@ -140,7 +140,7 @@ public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Getting diagnostics data files from System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
return "Getting diagnostics data files from System Instance with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java
View File

@ -153,7 +153,7 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Executing diagnostics on System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
return "Executing diagnostics on System Instance with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmd.java
View File

@ -85,7 +85,7 @@ public class CreateIpv4SubnetForGuestNetworkCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet=" + getResourceUuid(ApiConstants.PARENT_ID);
return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet: " + getResourceUuid(ApiConstants.PARENT_ID);
}
@Override

4
api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
View File

@ -115,7 +115,7 @@ public class MigrateNetworkCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
String description = "Migrating network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
String description = "Migrating Network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
if (getNetworkOfferingId() != null) {
Network network = _networkService.getNetwork(getId());
if (network == null) {
@ -128,7 +128,7 @@ public class MigrateNetworkCmd extends BaseAsyncCmd {
throw new InvalidParameterValueException("Network offering id supplied is invalid");
}
description += ". Original network offering id: " + oldOff.getUuid() + ", new network offering id: " + newOff.getUuid();
description += ". Original Network Offering id: " + oldOff.getUuid() + ", new Network Offering id: " + newOff.getUuid();
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
View File

@ -100,7 +100,7 @@ public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Updating physical network ServiceProvider with ID: " + getResourceUuid(ApiConstants.ID);
return "Updating Physical Network ServiceProvider with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
View File

@ -98,7 +98,7 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Updating Physical network: " + getResourceUuid(ApiConstants.ID);
return "Updating Physical Network with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
View File

@ -93,7 +93,7 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Update storage IP range " + getResourceUuid(ApiConstants.ID) + " [StartIp=" + getStartIp() + ", EndIp=" + getEndIp() + ", vlan=" + getVlan() + ", netmask=" + getNetmask() + ']';
return "Updating storage IP range " + getResourceUuid(ApiConstants.ID) + " [StartIp=" + getStartIp() + ", EndIp=" + getEndIp() + ", VLAN=" + getVlan() + ", netmask=" + getNetmask() + ']';
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmd.java
View File

@ -80,7 +80,7 @@ public class ChangeBgpPeersForNetworkCmd extends BaseAsyncCmd implements AdminCm
@Override
public String getEventDescription() {
return "Changing BGP Peers for network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
return "Changing BGP Peers for Network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
View File

@ -79,7 +79,7 @@ public class StopRouterCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Stopping router with ID: " + getResourceUuid(ApiConstants.ID);
return "Stopping virtual router with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

4
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
View File

@ -76,7 +76,7 @@ public class DestroySystemVmCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Destroying system Instance with ID: " + getResourceUuid(ApiConstants.ID);
return "Destroying System VM with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override
@ -98,7 +98,7 @@ public class DestroySystemVmCmd extends BaseAsyncCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to destroy system vm");
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy System VM");
}
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
View File

@ -120,7 +120,7 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Attempting to migrate Instance with ID: " + getResourceUuid(ApiConstants.VIRTUAL_MACHINE_ID) + " to host with ID: " + getResourceUuid(ApiConstants.HOST_ID);
return "Attempting to migrate System VM with ID: " + getResourceUuid(ApiConstants.VIRTUAL_MACHINE_ID) + " to host with ID: " + getResourceUuid(ApiConstants.HOST_ID);
}
@Override

4
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
View File

@ -86,7 +86,7 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Rebooting system VM with ID: " + getResourceUuid(ApiConstants.ID);
return "Rebooting System VM with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override
@ -112,7 +112,7 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to reboot system vm");
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reboot System Instance");
}
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
View File

@ -137,6 +137,6 @@ public class ScaleSystemVMCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Upgrading system vm: " + getResourceUuid(ApiConstants.ID) + " to service offering: " + getResourceUuid(ApiConstants.SERVICE_OFFERING_ID);
return "Upgrading System VM with ID: " + getResourceUuid(ApiConstants.ID) + " to service offering: " + getResourceUuid(ApiConstants.SERVICE_OFFERING_ID);
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
View File

@ -87,7 +87,7 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Starting system VM with ID: " + getResourceUuid(ApiConstants.ID);
return "Starting System VM with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
View File

@ -100,7 +100,7 @@ public class UpgradeSystemVMCmd extends BaseCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to reboot system vm");
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reboot System VM");
}
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
View File

@ -160,7 +160,7 @@ public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
return "creating AutoScale Policy";
return "Creating AutoScale Policy";
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
View File

@ -185,7 +185,7 @@ public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
return "Configuring AutoScale Instance Group. Instance Group Id: " + getEntityId();
return "Configuring AutoScale Instance Group with ID: " + getEntityId();
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
View File

@ -127,7 +127,7 @@ public class CreateConditionCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
return "creating a condition";
return "Creating AutoScale condition";
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
View File

@ -89,7 +89,7 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Deleting autoscale Instance group with ID: " + getResourceUuid(ApiConstants.ID);
return "Deleting AutoScale Instance group with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
View File

@ -79,7 +79,7 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Deleting autoscale Instance profile with ID: " + getResourceUuid(ApiConstants.ID);
return "Deleting AutoScale Instance profile with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
View File

@ -100,6 +100,6 @@ public class DeleteConditionCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Deleting auto scaling condition with ID: " + getResourceUuid(ApiConstants.ID);
return "Deleting AutoScale condition with ID: " + getResourceUuid(ApiConstants.ID);
}
}

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
View File

@ -130,7 +130,7 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Updating Auto Scale Policy with ID: " + getResourceUuid(ApiConstants.ID);
return "Updating AutoScale Policy with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
View File

@ -151,7 +151,7 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd {
@Override
public String getEventDescription() {
return "Updating AutoScale Instance Group. Instance Group Id: " + getId();
return "Updating AutoScale Instance Group with ID: " + getId();
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
View File

@ -190,7 +190,7 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd {
@Override
public String getEventDescription() {
return "Updating AutoScale Instance Profile. Instance Profile Id: " + getId();
return "Updating AutoScale Instance Profile with ID: " + getId();
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java
View File

@ -110,6 +110,6 @@ public class UpdateConditionCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Updating VM auto scaling condition with ID: " + getResourceUuid(ApiConstants.ID);
return "Updating Instance AutoScale condition with ID: " + getResourceUuid(ApiConstants.ID);
}
}

4
api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
View File

@ -76,10 +76,10 @@ public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
String description = "Associating network ACL with ID:" + getResourceUuid(ApiConstants.ACL_ID);
String description = "Associating Network ACL with ID:" + getResourceUuid(ApiConstants.ACL_ID);
if (getNetworkId() != null) {
description += " to network with ID:" + getResourceUuid(ApiConstants.NETWORK_ID);
description += " to Network with ID:" + getResourceUuid(ApiConstants.NETWORK_ID);
}
return description;

2
api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
View File

@ -115,7 +115,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Restarting network with ID: " + getResourceUuid(ApiConstants.ID);
return "Restarting Network with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ExtractSnapshotCmd.java
View File

@ -96,7 +96,7 @@ public class ExtractSnapshotCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Starting snapshot extraction for snapshot with ID: " + getResourceUuid(ApiConstants.ID);
return "Starting Snapshot extraction for Snapshot with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
View File

@ -136,7 +136,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd implements UserCmd {
@Override
public String getEventDescription() {
String description = "Copying template: " + getResourceUuid(ApiConstants.ID);
String description = "Copying Template: " + getResourceUuid(ApiConstants.ID);
if (getSourceZoneId() != null) {
description += " from zone: " + getResourceUuid(ApiConstants.SOURCE_ZONE_ID);

2
api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
View File

@ -121,7 +121,7 @@ public class AddNicToVMCmd extends BaseAsyncCmd implements UserCmd {
@Override
public String getEventDescription() {
return "Adding NIC on network " + getResourceUuid(ApiConstants.NETWORK_ID) + " to User Instance: " + getResourceUuid(ApiConstants.VIRTUAL_MACHINE_ID);
return "Adding NIC on Network " + getResourceUuid(ApiConstants.NETWORK_ID) + " to User Instance: " + getResourceUuid(ApiConstants.VIRTUAL_MACHINE_ID);
}
@Override