Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VM #1444

Merged
merged 3 commits into from
May 12, 2016
Merged

CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VM #1444

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ad3c5e
CLOUDSTACK-8800 : Improved the listVirtualMachines API call to includ…
Oct 9, 2015
866ac7b
Fixed issues from CLOUDSTACK-8800 that were introduced in PR 780
rafaelweingartner Apr 29, 2016
417d9a5
Removed unnecessary check when creating the “userVmResponse” object.
rafaelweingartner May 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Removed unnecessary check when creating the “userVmResponse” object.
  • Loading branch information
@rafaelweingartner
rafaelweingartner committed May 6, 2016
commit 417d9a5d800facc48b6df46ada2e73223a16b5dd
31 changes: 9 additions & 22 deletions server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@

import javax.inject.Inject;

import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
Expand All @@ -38,11 +35,12 @@
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.gpu.GPU;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.service.ServiceOfferingDetailsVO;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
Expand Down Expand Up @@ -200,27 +198,16 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
VmStats vmStats = ApiDBUtils.getVmStatistics(userVm.getId());
if (vmStats != null) {
userVmResponse.setCpuUsed(new DecimalFormat("#.##").format(vmStats.getCPUUtilization()) + "%");

userVmResponse.setNetworkKbsRead((long)vmStats.getNetworkReadKBs());

userVmResponse.setNetworkKbsWrite((long)vmStats.getNetworkWriteKBs());
userVmResponse.setDiskKbsRead((long)vmStats.getDiskReadKBs());
userVmResponse.setDiskKbsWrite((long)vmStats.getDiskWriteKBs());
userVmResponse.setDiskIORead((long)vmStats.getDiskReadIOs());
userVmResponse.setDiskIOWrite((long)vmStats.getDiskWriteIOs());
userVmResponse.setMemoryKBs((long)vmStats.getMemoryKBs());
userVmResponse.setMemoryIntFreeKBs((long)vmStats.getIntFreeMemoryKBs());
userVmResponse.setMemoryTargetKBs((long)vmStats.getTargetMemoryKBs());

if ((userVm.getHypervisorType() != null) && (userVm.getHypervisorType().equals(HypervisorType.KVM) || userVm.getHypervisorType().equals(HypervisorType.XenServer) || userVm.getHypervisorType().equals(HypervisorType.VMware))) { // support KVM and XenServer only util 2013.06.25 . supporting Vmware from 2015.09.02
userVmResponse.setDiskKbsRead((long)vmStats.getDiskReadKBs());

userVmResponse.setDiskKbsWrite((long) vmStats.getDiskWriteKBs());

userVmResponse.setDiskIORead((long) vmStats.getDiskReadIOs());

userVmResponse.setDiskIOWrite((long) vmStats.getDiskWriteIOs());

userVmResponse.setMemoryKBs((long) vmStats.getMemoryKBs());

userVmResponse.setMemoryIntFreeKBs((long) vmStats.getIntFreeMemoryKBs());

userVmResponse.setMemoryTargetKBs((long) vmStats.getTargetMemoryKBs());

}
}
}

Expand Down