Skip to content

Commit 949247f

Browse files
bernardodemarcobernardodemarco
committed
change usage type response
1 parent 7ba3779 commit 949247f

File tree

5 files changed

+37
-42
lines changed

5 files changed

+37
-42
lines changed

‎api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.cloudstack.api.BaseCmd;
2424
import org.apache.cloudstack.api.response.ListResponse;
2525
import org.apache.cloudstack.api.response.UsageTypeResponse;
26+
import org.apache.cloudstack.usage.UsageTypes;
2627

2728
import com.cloud.user.Account;
2829

@@ -37,8 +38,8 @@ public long getEntityOwnerId() {
3738

3839
@Override
3940
public void execute() {
40-
List<UsageTypeResponse> result = _usageService.listUsageTypes();
41-
ListResponse<UsageTypeResponse> response = new ListResponse<UsageTypeResponse>();
41+
List<UsageTypeResponse> result = UsageTypes.listUsageTypes();
42+
ListResponse<UsageTypeResponse> response = new ListResponse<>();
4243
response.setResponses(result);
4344
response.setResponseName(getCommandName());
4445
this.setResponseObject(response);

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@
2525

2626
public class UsageTypeResponse extends BaseResponse {
2727

28-
@SerializedName("usagetypeid")
29-
@Param(description = "usage type")
28+
@SerializedName("id")
29+
@Param(description = "Usage type ID")
3030
private Integer usageType;
3131

32+
@SerializedName(ApiConstants.NAME)
33+
@Param(description = "Usage type name")
34+
private String name;
35+
3236
@SerializedName(ApiConstants.DESCRIPTION)
33-
@Param(description = "description of usage type")
37+
@Param(description = "Usage type description")
3438
private String description;
3539

3640
public String getDescription() {
@@ -49,10 +53,10 @@ public void setUsageType(Integer usageType) {
4953
this.usageType = usageType;
5054
}
5155

52-
public UsageTypeResponse(Integer usageType, String description) {
56+
public UsageTypeResponse(Integer usageType, String name, String description) {
5357
this.usageType = usageType;
58+
this.name = name;
5459
this.description = description;
5560
setObjectName("usagetype");
5661
}
57-
5862
}

‎api/src/main/java/org/apache/cloudstack/usage/UsageService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd;
2121
import org.apache.cloudstack.api.command.admin.usage.ListUsageRecordsCmd;
2222
import org.apache.cloudstack.api.command.admin.usage.RemoveRawUsageRecordsCmd;
23-
import org.apache.cloudstack.api.response.UsageTypeResponse;
2423

2524
import java.util.List;
2625
import java.util.TimeZone;
@@ -62,6 +61,4 @@ public interface UsageService {
6261
TimeZone getUsageTimezone();
6362

6463
boolean removeRawUsageRecords(RemoveRawUsageRecordsCmd cmd);
65-
66-
List<UsageTypeResponse> listUsageTypes();
6764
}

‎api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,31 @@ public class UsageTypes {
5151

5252
public static List<UsageTypeResponse> listUsageTypes() {
5353
List<UsageTypeResponse> responseList = new ArrayList<UsageTypeResponse>();
54-
responseList.add(new UsageTypeResponse(RUNNING_VM, "Running Vm Usage"));
55-
responseList.add(new UsageTypeResponse(ALLOCATED_VM, "Allocated Vm Usage"));
56-
responseList.add(new UsageTypeResponse(IP_ADDRESS, "IP Address Usage"));
57-
responseList.add(new UsageTypeResponse(NETWORK_BYTES_SENT, "Network Usage (Bytes Sent)"));
58-
responseList.add(new UsageTypeResponse(NETWORK_BYTES_RECEIVED, "Network Usage (Bytes Received)"));
59-
responseList.add(new UsageTypeResponse(VOLUME, "Volume Usage"));
60-
responseList.add(new UsageTypeResponse(TEMPLATE, "Template Usage"));
61-
responseList.add(new UsageTypeResponse(ISO, "ISO Usage"));
62-
responseList.add(new UsageTypeResponse(SNAPSHOT, "Snapshot Usage"));
63-
responseList.add(new UsageTypeResponse(SECURITY_GROUP, "Security Group Usage"));
64-
responseList.add(new UsageTypeResponse(LOAD_BALANCER_POLICY, "Load Balancer Usage"));
65-
responseList.add(new UsageTypeResponse(PORT_FORWARDING_RULE, "Port Forwarding Usage"));
66-
responseList.add(new UsageTypeResponse(NETWORK_OFFERING, "Network Offering Usage"));
67-
responseList.add(new UsageTypeResponse(VPN_USERS, "VPN users usage"));
68-
responseList.add(new UsageTypeResponse(VM_DISK_IO_READ, "VM Disk usage(I/O Read)"));
69-
responseList.add(new UsageTypeResponse(VM_DISK_IO_WRITE, "VM Disk usage(I/O Write)"));
70-
responseList.add(new UsageTypeResponse(VM_DISK_BYTES_READ, "VM Disk usage(Bytes Read)"));
71-
responseList.add(new UsageTypeResponse(VM_DISK_BYTES_WRITE, "VM Disk usage(Bytes Write)"));
72-
responseList.add(new UsageTypeResponse(VM_SNAPSHOT, "VM Snapshot storage usage"));
73-
responseList.add(new UsageTypeResponse(VOLUME_SECONDARY, "Volume on secondary storage usage"));
74-
responseList.add(new UsageTypeResponse(VM_SNAPSHOT_ON_PRIMARY, "VM Snapshot on primary storage usage"));
75-
responseList.add(new UsageTypeResponse(BACKUP, "Backup storage usage"));
76-
responseList.add(new UsageTypeResponse(BUCKET, "Bucket storage usage"));
77-
responseList.add(new UsageTypeResponse(NETWORK, "Network usage"));
78-
responseList.add(new UsageTypeResponse(VPC, "VPC usage"));
54+
responseList.add(new UsageTypeResponse(RUNNING_VM, "RUNNING_VM", "Running Vm Usage"));
55+
responseList.add(new UsageTypeResponse(ALLOCATED_VM, "ALLOCATED_VM", "Allocated Vm Usage"));
56+
responseList.add(new UsageTypeResponse(IP_ADDRESS, "IP_ADDRESS", "IP Address Usage"));
57+
responseList.add(new UsageTypeResponse(NETWORK_BYTES_SENT, "NETWORK_BYTES_SENT", "Network Usage (Bytes Sent)"));
58+
responseList.add(new UsageTypeResponse(NETWORK_BYTES_RECEIVED, "NETWORK_BYTES_RECEIVED", "Network Usage (Bytes Received)"));
59+
responseList.add(new UsageTypeResponse(VOLUME, "VOLUME", "Volume Usage"));
60+
responseList.add(new UsageTypeResponse(TEMPLATE, "TEMPLATE", "Template Usage"));
61+
responseList.add(new UsageTypeResponse(ISO, "ISO", "ISO Usage"));
62+
responseList.add(new UsageTypeResponse(SNAPSHOT, "SNAPSHOT", "Snapshot Usage"));
63+
responseList.add(new UsageTypeResponse(SECURITY_GROUP, "SECURITY_GROUP", "Security Group Usage"));
64+
responseList.add(new UsageTypeResponse(LOAD_BALANCER_POLICY, "LOAD_BALANCER_POLICY", "Load Balancer Usage"));
65+
responseList.add(new UsageTypeResponse(PORT_FORWARDING_RULE, "PORT_FORWARDING_RULE", "Port Forwarding Usage"));
66+
responseList.add(new UsageTypeResponse(NETWORK_OFFERING, "NETWORK_OFFERING", "Network Offering Usage"));
67+
responseList.add(new UsageTypeResponse(VPN_USERS, "VPN_USERS", "VPN users usage"));
68+
responseList.add(new UsageTypeResponse(VM_DISK_IO_READ, "VM_DISK_IO_READ", "VM Disk usage(I/O Read)"));
69+
responseList.add(new UsageTypeResponse(VM_DISK_IO_WRITE, "VM_DISK_IO_WRITE", "VM Disk usage(I/O Write)"));
70+
responseList.add(new UsageTypeResponse(VM_DISK_BYTES_READ, "VM_DISK_BYTES_READ", "VM Disk usage(Bytes Read)"));
71+
responseList.add(new UsageTypeResponse(VM_DISK_BYTES_WRITE, "VM_DISK_BYTES_WRITE", "VM Disk usage(Bytes Write)"));
72+
responseList.add(new UsageTypeResponse(VM_SNAPSHOT, "VM_SNAPSHOT", "VM Snapshot storage usage"));
73+
responseList.add(new UsageTypeResponse(VOLUME_SECONDARY, "VOLUME_SECONDARY", "Volume on secondary storage usage"));
74+
responseList.add(new UsageTypeResponse(VM_SNAPSHOT_ON_PRIMARY, "VM_SNAPSHOT_ON_PRIMARY", "VM Snapshot on primary storage usage"));
75+
responseList.add(new UsageTypeResponse(BACKUP, "BACKUP", "Backup storage usage"));
76+
responseList.add(new UsageTypeResponse(BUCKET, "BUCKET", "Bucket storage usage"));
77+
responseList.add(new UsageTypeResponse(NETWORK, "NETWORK", "Network usage"));
78+
responseList.add(new UsageTypeResponse(VPC, "VPC", "VPC usage"));
7979
return responseList;
8080
}
8181
}

‎server/src/main/java/com/cloud/usage/UsageServiceImpl.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd;
3232
import org.apache.cloudstack.api.command.admin.usage.ListUsageRecordsCmd;
3333
import org.apache.cloudstack.api.command.admin.usage.RemoveRawUsageRecordsCmd;
34-
import org.apache.cloudstack.api.response.UsageTypeResponse;
3534
import org.apache.cloudstack.context.CallContext;
3635
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3736
import org.apache.cloudstack.usage.Usage;
@@ -485,10 +484,4 @@ public boolean removeRawUsageRecords(RemoveRawUsageRecordsCmd cmd) throws Invali
485484
}
486485
return true;
487486
}
488-
489-
@Override
490-
public List<UsageTypeResponse> listUsageTypes() {
491-
return UsageTypes.listUsageTypes();
492-
}
493-
494487
}

0 commit comments

Comments
 (0)