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 10489: self review updates

Browse Source
This commit is contained in:
Abhinandan Prateek 2011-06-30 10:52:03 +05:30 committed by root
parent 6ba0b35295
commit c30225c2af
6 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/api/response/NicResponse.java
View File

@ -145,6 +145,6 @@ public class NicResponse extends BaseResponse {
@Override
public boolean equals(Object r){
return id==((NicResponse)r).id;
return (r instanceof NicResponse) && id==((NicResponse)r).id;
}
}

2
api/src/com/cloud/api/response/SecurityGroupResponse.java
View File

@ -134,6 +134,6 @@ public class SecurityGroupResponse extends BaseResponse {
@Override
public boolean equals(Object r){
return id==((SecurityGroupResponse)r).id;
return (r instanceof SecurityGroupResponse) && id==((SecurityGroupResponse)r).id;
}
}

2
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -591,7 +591,7 @@ public class ApiDBUtils {
return _firewallCidrsDao.getSourceCidrs(id);
}
public static List<UserVmResponse> listVmDetails(UserVm userVm, boolean show_host){
public static UserVmResponse listVmDetails(UserVm userVm, boolean show_host){
return _userVmDao.listVmDetails(userVm, show_host);
}

28
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1047,24 +1047,22 @@ public class ApiResponseHelper implements ResponseGenerator {
DecimalFormat decimalFormat = new DecimalFormat("#.##");
for (UserVm userVm : userVms) {
List<UserVmResponse> rsps = ApiDBUtils.listVmDetails(userVm, (((caller == null) || (caller.getType() == Account.ACCOUNT_TYPE_ADMIN)) && (userVm.getHostId() != null)));
for (UserVmResponse userVmResponse: rsps){
// stats calculation
String cpuUsed = null;
VmStats vmStats = ApiDBUtils.getVmStatistics(userVm.getId());
if (vmStats != null) {
float cpuUtil = (float) vmStats.getCPUUtilization();
cpuUsed = decimalFormat.format(cpuUtil) + "%";
userVmResponse.setCpuUsed(cpuUsed);
UserVmResponse userVmResponse = ApiDBUtils.listVmDetails(userVm, (((caller == null) || (caller.getType() == Account.ACCOUNT_TYPE_ADMIN)) && (userVm.getHostId() != null)));
// stats calculation
String cpuUsed = null;
VmStats vmStats = ApiDBUtils.getVmStatistics(userVm.getId());
if (vmStats != null) {
float cpuUtil = (float) vmStats.getCPUUtilization();
cpuUsed = decimalFormat.format(cpuUtil) + "%";
userVmResponse.setCpuUsed(cpuUsed);
Double networkKbRead = Double.valueOf(vmStats.getNetworkReadKBs());
userVmResponse.setNetworkKbsRead(networkKbRead.longValue());
Double networkKbRead = Double.valueOf(vmStats.getNetworkReadKBs());
userVmResponse.setNetworkKbsRead(networkKbRead.longValue());
Double networkKbWrite = Double.valueOf(vmStats.getNetworkWriteKBs());
userVmResponse.setNetworkKbsWrite(networkKbWrite.longValue());
}
vmResponses.add(userVmResponse);
Double networkKbWrite = Double.valueOf(vmStats.getNetworkWriteKBs());
userVmResponse.setNetworkKbsWrite(networkKbWrite.longValue());
}
vmResponses.add(userVmResponse);
}
return vmResponses;
}

2
server/src/com/cloud/vm/dao/UserVmDao.java
View File

@ -71,5 +71,5 @@ public interface UserVmDao extends GenericDao<UserVmVO, Long> {
List<Long> listPodIdsHavingVmsforAccount(long zoneId, long accountId);
public Long countAllocatedVMsForAccount(long accountId);
List<UserVmResponse> listVmDetails(UserVm userVm, boolean show_host);
UserVmResponse listVmDetails(UserVm userVm, boolean show_host);
}

6
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
View File

@ -341,10 +341,9 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
}
@Override
public List<UserVmResponse> listVmDetails(UserVm userVm, boolean show_host){
public UserVmResponse listVmDetails(UserVm userVm, boolean show_host){
Transaction txn = Transaction.currentTxn();
PreparedStatement pstmt = null;
List<UserVmResponse> result = new ArrayList<UserVmResponse>();
try {
String sql = VM_DETAILS;
@ -409,7 +408,6 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
userVmResponse.setRootDeviceType(rs.getString("volumes.volume_type"));
is_data_center_security_group_enabled = rs.getBoolean("data_center.is_security_group_enabled");
result.add(userVmResponse);
}
//security_group.id, security_group.name, security_group.description, , data_center.is_security_group_enabled
@ -449,7 +447,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
}
userVmResponse.setSecurityGroupList(new ArrayList(securityGroupResponse));
userVmResponse.setNics(new ArrayList(nicResponses));
return result;
return userVmResponse;
} catch (SQLException e) {
throw new CloudRuntimeException("DB Exception on: " + VM_DETAILS, e);
} catch (Throwable e) {