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

Bug 13326: Include isElastic flag in IPAddress usage response

Browse Source 
Reviewed-By: Nitin
This commit is contained in:
kishan 2012-02-03 18:01:04 +05:30
parent 1c95ed5012
commit b15e5d6730
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/api/commands/GetUsageRecordsCmd.java
View File

@ -250,10 +250,11 @@ public class GetUsageRecordsCmd extends BaseListCmd {
usageRecResponse.setUsageId(usageRecord.getUsageId()); usageRecResponse.setUsageId(usageRecord.getUsageId());
if(usageRecord.getUsageType() == UsageTypes.IP_ADDRESS){ if(usageRecord.getUsageType() == UsageTypes.IP_ADDRESS){
usageRecResponse.setSourceNat((usageRecord.getType().equals("SourceNat"))?true:false); usageRecResponse.setSourceNat((usageRecord.getType().equals("SourceNat"))?true:false);
usageRecResponse.setElastic((usageRecord.getSize() == 1)?true:false);
} else { } else {
usageRecResponse.setType(usageRecord.getType()); usageRecResponse.setType(usageRecord.getType());
}
usageRecResponse.setSize(usageRecord.getSize()); usageRecResponse.setSize(usageRecord.getSize());
}
if (usageRecord.getRawUsage() != null) { if (usageRecord.getRawUsage() != null) {
DecimalFormat decimalFormat = new DecimalFormat("###########.######"); DecimalFormat decimalFormat = new DecimalFormat("###########.######");

7
server/src/com/cloud/server/api/response/UsageRecordResponse.java
View File

@ -100,6 +100,9 @@ public class UsageRecordResponse extends BaseResponse implements ControlledEntit
@SerializedName("issourcenat") @Param(description="source Nat flag for IPAddress") @SerializedName("issourcenat") @Param(description="source Nat flag for IPAddress")
private Boolean isSourceNat; private Boolean isSourceNat;
@SerializedName("iselastic") @Param(description="Elastic flag for IPAddress")
private Boolean isElastic;
@Override @Override
public void setAccountName(String accountName) { public void setAccountName(String accountName) {
this.accountName = accountName; this.accountName = accountName;
@ -186,6 +189,10 @@ public class UsageRecordResponse extends BaseResponse implements ControlledEntit
this.isSourceNat = isSourceNat; this.isSourceNat = isSourceNat;
} }
public void setElastic(Boolean isElastic) {
this.isElastic = isElastic;
}
@Override @Override
public void setProjectId(Long projectId) { public void setProjectId(Long projectId) {
this.projectId.setValue(projectId); this.projectId.setValue(projectId);

2
usage/src/com/cloud/usage/UsageManagerImpl.java
View File

@ -1010,7 +1010,7 @@ public class UsageManagerImpl implements UsageManager, Runnable {
long id = event.getResourceId(); long id = event.getResourceId();
long sourceNat = event.getSize(); long sourceNat = event.getSize();
boolean isSourceNat = (sourceNat == 1) ? true : false ; boolean isSourceNat = (sourceNat == 1) ? true : false ;
boolean isElastic = (event.getTemplateId() == 1) ? true : false ; boolean isElastic = (event.getTemplateId() == null || event.getTemplateId() == 0) ? false : true ;
UsageIPAddressVO ipAddressVO = new UsageIPAddressVO(id, event.getAccountId(), acct.getDomainId(), zoneId, ipAddress, isSourceNat, isElastic, event.getCreateDate(), null); UsageIPAddressVO ipAddressVO = new UsageIPAddressVO(id, event.getAccountId(), acct.getDomainId(), zoneId, ipAddress, isSourceNat, isElastic, event.getCreateDate(), null);
m_usageIPAddressDao.persist(ipAddressVO); m_usageIPAddressDao.persist(ipAddressVO);
} else if (EventTypes.EVENT_NET_IP_RELEASE.equals(event.getType())) { } else if (EventTypes.EVENT_NET_IP_RELEASE.equals(event.getType())) {