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

[CLOUDSTACK-10259] Missing float part of secondary storage data in listAccounts

This commit is contained in:
Rafael Weingärtner 2018-01-30 19:52:02 -02:00
parent 1acc8690c4
commit 73251bf830
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/com/cloud/configuration/Resource.java
View File

@ -38,8 +38,8 @@ public interface Resource {
private ResourceOwnerType[] supportedOwners;
private int ordinal;
public static final long bytesToKiB = 1024;
public static final long bytesToMiB = 1024 * 1024;
public static final long bytesToGiB = 1024 * 1024 * 1024;
public static final long bytesToMiB = bytesToKiB * 1024;
public static final long bytesToGiB = bytesToMiB * 1024;
ResourceType(String name, int ordinal, ResourceOwnerType... supportedOwners) {
this.name = name;

5
api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
View File

@ -29,7 +29,6 @@ import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
import com.cloud.user.Account;
@SuppressWarnings("unused")
@EntityReference(value = Account.class)
public class AccountResponse extends BaseResponse implements ResourceLimitAndCountResponse {
@SerializedName(ApiConstants.ID)
@ -222,7 +221,7 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
@SerializedName("secondarystoragetotal")
@Param(description = "the total secondary storage space (in GiB) owned by account", since = "4.2.0")
private Long secondaryStorageTotal;
private float secondaryStorageTotal;
@SerializedName("secondarystorageavailable")
@Param(description = "the total secondary storage space (in GiB) available to be used for this account", since = "4.2.0")
@ -501,7 +500,7 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
}
@Override
public void setSecondaryStorageTotal(Long secondaryStorageTotal) {
public void setSecondaryStorageTotal(float secondaryStorageTotal) {
this.secondaryStorageTotal = secondaryStorageTotal;
}

4
api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
View File

@ -165,7 +165,7 @@ public class DomainResponse extends BaseResponse implements ResourceLimitAndCoun
private String secondaryStorageLimit;
@SerializedName("secondarystoragetotal") @Param(description="the total secondary storage space (in GiB) owned by domain", since="4.2.0")
private Long secondaryStorageTotal;
private float secondaryStorageTotal;
@SerializedName("secondarystorageavailable") @Param(description="the total secondary storage space (in GiB) available to be used for this domain", since="4.2.0")
private String secondaryStorageAvailable;
@ -399,7 +399,7 @@ public class DomainResponse extends BaseResponse implements ResourceLimitAndCoun
}
@Override
public void setSecondaryStorageTotal(Long secondaryStorageTotal) {
public void setSecondaryStorageTotal(float secondaryStorageTotal) {
this.secondaryStorageTotal = secondaryStorageTotal;
}

5
api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
View File

@ -29,7 +29,6 @@ import com.cloud.projects.Project;
import com.cloud.serializer.Param;
@EntityReference(value = Project.class)
@SuppressWarnings("unused")
public class ProjectResponse extends BaseResponse implements ResourceLimitAndCountResponse {
@SerializedName(ApiConstants.ID)
@ -134,7 +133,7 @@ public class ProjectResponse extends BaseResponse implements ResourceLimitAndCou
@SerializedName("secondarystoragetotal")
@Param(description = "the total secondary storage space (in GiB) owned by project", since = "4.2.0")
private Long secondaryStorageTotal;
private float secondaryStorageTotal;
@SerializedName("secondarystorageavailable")
@Param(description = "the total secondary storage space (in GiB) available to be used for this project", since = "4.2.0")
@ -414,7 +413,7 @@ public class ProjectResponse extends BaseResponse implements ResourceLimitAndCou
}
@Override
public void setSecondaryStorageTotal(Long secondaryStorageTotal) {
public void setSecondaryStorageTotal(float secondaryStorageTotal) {
this.secondaryStorageTotal = secondaryStorageTotal;
}

2
api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
View File

@ -54,7 +54,7 @@ public interface ResourceLimitAndCountResponse {
public void setSecondaryStorageLimit(String secondaryStorageLimit);
public void setSecondaryStorageTotal(Long secondaryStorageTotal);
public void setSecondaryStorageTotal(float secondaryStorageTotal);
public void setSecondaryStorageAvailable(String secondaryStorageAvailable);

2
server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java
View File

@ -214,7 +214,7 @@ public class AccountJoinDaoImpl extends GenericDaoBase<AccountJoinVO, Long> impl
//get resource limits for secondary storage space and convert it from Bytes to GiB
long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimit(account.getSecondaryStorageLimit(), account.getId(), ResourceType.secondary_storage);
String secondaryStorageLimitDisplay = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB);
long secondaryStorageTotal = (account.getSecondaryStorageTotal() == null) ? 0 : (account.getSecondaryStorageTotal() / ResourceType.bytesToGiB);
float secondaryStorageTotal = (account.getSecondaryStorageTotal() == null) ? 0 : (account.getSecondaryStorageTotal() / (ResourceType.bytesToGiB * 1f));
String secondaryStorageAvail = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB)
- secondaryStorageTotal);

2
server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java
View File

@ -183,7 +183,7 @@ public class DomainJoinDaoImpl extends GenericDaoBase<DomainJoinVO, Long> implem
//get resource limits for secondary storage space and convert it from Bytes to GiB
long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getSecondaryStorageLimit(), ResourceType.secondary_storage, domain.getId());
String secondaryStorageLimitDisplay = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf(secondaryStorageLimit / ResourceType.bytesToGiB);
long secondaryStorageTotal = (domain.getSecondaryStorageTotal() == null) ? 0 : (domain.getSecondaryStorageTotal() / ResourceType.bytesToGiB);
float secondaryStorageTotal = (domain.getSecondaryStorageTotal() == null) ? 0 : (domain.getSecondaryStorageTotal() / (ResourceType.bytesToGiB * 1f));
String secondaryStorageAvail = (fullView || secondaryStorageLimit == -1) ? "Unlimited" : String.valueOf((secondaryStorageLimit / ResourceType.bytesToGiB) - secondaryStorageTotal);
response.setSecondaryStorageLimit(secondaryStorageLimitDisplay);
response.setSecondaryStorageTotal(secondaryStorageTotal);