Skip to content

Commit b419a77

Browse files
committed
standardize events and fix rebase errors
1 parent 6f16482 commit b419a77

31 files changed

+35
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@ public String getEventType() {
142142

143143
@Override
144144
public String getEventDescription() {
145-
return String.format("Executing DRS plan for cluster: %d", getResourceUuid(ApiConstants.ID));
145+
return "Executing DRS plan for cluster with ID: " + getResourceUuid(ApiConstants.ID);
146146
}
147147
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public String getEventType() {
140140

141141
@Override
142142
public String getEventDescription() {
143-
return "Getting diagnostics data files from System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
143+
return "Getting diagnostics data files from System Instance with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
144144
}
145145

146146
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public ApiCommandResourceType getApiResourceType() {
153153

154154
@Override
155155
public String getEventDescription() {
156-
return "Executing diagnostics on System VM with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
156+
return "Executing diagnostics on System Instance with ID: " + getResourceUuid(ApiConstants.TARGET_ID);
157157
}
158158

159159
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String getEventType() {
8585

8686
@Override
8787
public String getEventDescription() {
88-
return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet=" + getResourceUuid(ApiConstants.PARENT_ID);
88+
return "Creating guest IPv4 subnet " + getSubnet() + " in zone subnet: " + getResourceUuid(ApiConstants.PARENT_ID);
8989
}
9090

9191
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void execute() {
115115

116116
@Override
117117
public String getEventDescription() {
118-
String description = "Migrating network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
118+
String description = "Migrating Network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
119119
if (getNetworkOfferingId() != null) {
120120
Network network = _networkService.getNetwork(getId());
121121
if (network == null) {
@@ -128,7 +128,7 @@ public String getEventDescription() {
128128
throw new InvalidParameterValueException("Network offering id supplied is invalid");
129129
}
130130

131-
description += ". Original network offering id: " + oldOff.getUuid() + ", new network offering id: " + newOff.getUuid();
131+
description += ". Original Network Offering id: " + oldOff.getUuid() + ", new Network Offering id: " + newOff.getUuid();
132132
}
133133
}
134134

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public String getEventType() {
100100

101101
@Override
102102
public String getEventDescription() {
103-
return "Updating physical network ServiceProvider with ID: " + getResourceUuid(ApiConstants.ID);
103+
return "Updating Physical Network ServiceProvider with ID: " + getResourceUuid(ApiConstants.ID);
104104
}
105105

106106
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void execute() {
9898

9999
@Override
100100
public String getEventDescription() {
101-
return "Updating Physical network: " + getResourceUuid(ApiConstants.ID);
101+
return "Updating Physical Network with ID: " + getResourceUuid(ApiConstants.ID);
102102
}
103103

104104
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public String getEventType() {
9393

9494
@Override
9595
public String getEventDescription() {
96-
return "Update storage IP range " + getResourceUuid(ApiConstants.ID) + " [StartIp=" + getStartIp() + ", EndIp=" + getEndIp() + ", vlan=" + getVlan() + ", netmask=" + getNetmask() + ']';
96+
return "Updating storage IP range " + getResourceUuid(ApiConstants.ID) + " [StartIp=" + getStartIp() + ", EndIp=" + getEndIp() + ", VLAN=" + getVlan() + ", netmask=" + getNetmask() + ']';
9797
}
9898

9999
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public String getEventType() {
8080

8181
@Override
8282
public String getEventDescription() {
83-
return "Changing BGP Peers for network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
83+
return "Changing BGP Peers for Network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
8484
}
8585

8686
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public String getEventType() {
7979

8080
@Override
8181
public String getEventDescription() {
82-
return "Stopping router with ID: " + getResourceUuid(ApiConstants.ID);
82+
return "Stopping virtual router with ID: " + getResourceUuid(ApiConstants.ID);
8383
}
8484

8585
@Override

0 commit comments

Comments
 (0)