You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/10/24 01:05:33 UTC
git commit: updated refs/heads/4.2 to 0bb06d5
Updated Branches:
refs/heads/4.2 187e328f6 -> 0bb06d5d9
CLOUDSTACK-4649:
get VM details from DB
Anthony
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0bb06d5d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0bb06d5d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0bb06d5d
Branch: refs/heads/4.2
Commit: 0bb06d5d987525871bf5dc55e809c0a728067ec5
Parents: 187e328
Author: Anthony Xu <an...@citrix.com>
Authored: Wed Oct 23 16:02:44 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed Oct 23 16:05:03 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/hypervisor/HypervisorGuruBase.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0bb06d5d/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
index b1cc94b..aa59dda 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -40,12 +40,14 @@ import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.UserVmDetailsDao;
public abstract class HypervisorGuruBase extends AdapterBase implements HypervisorGuru {
@Inject VMTemplateDetailsDao _templateDetailsDao;
@Inject NicDao _nicDao;
@Inject VMInstanceDao _virtualMachineDao;
+ @Inject UserVmDetailsDao _userVmDetailsDao;
@Inject NicSecondaryIpDao _nicSecIpDao;
@Inject ConfigurationServer _configServer;
@@ -120,7 +122,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
to.setArch("x86_64");
}
- Map<String, String> detailsInVm = vm.getDetails();
+ Map<String, String> detailsInVm = _userVmDetailsDao.findDetails(vm.getId());
if(detailsInVm != null) {
to.setDetails(detailsInVm);
}