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

vm meta sync sync xstoolsversion as well

This commit is contained in:
Anthony Xu 2014-03-24 15:48:21 -07:00
parent b3ad4192dd
commit 7b19b6cc19
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -1051,10 +1051,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (vm.getType() == VirtualMachine.Type.User) {
String platform = answer.getPlatform();
if (platform != null) {
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("platform", platform);
_userVmDao.saveDetails(userVm);
Map<String,String> vmmetadata = new HashMap<String,String>();
vmmetadata.put(vm.getInstanceName(), platform);
syncVMMetaData(vmmetadata);
}
}
}
@ -2558,21 +2557,32 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
VMInstanceVO vm = _vmDao.findVMByInstanceName(name);
if (vm != null && vm.getType() == VirtualMachine.Type.User) {
// track platform info
boolean changed = false;
UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmDao.loadDetails(userVm);
userVm.setDetail("platform", platform);
if ( userVm.details.containsKey("timeoffset")) {
userVm.details.remove("timeoffset");
changed = true;
}
if (!userVm.details.containsKey("platform") || !userVm.details.get("platform").equals(platform)) {
userVm.setDetail("platform", platform);
changed = true;
}
String pvdriver = "xenserver56";
if ( platform.contains("device_id")) {
pvdriver = "xenserver61";
}
userVm.setDetail("hypervisortoolsversion", pvdriver);
_userVmDao.saveDetails(userVm);
if (!userVm.details.containsKey("hypervisortoolsversion") || !userVm.details.get("hypervisortoolsversion").equals(pvdriver)) {
userVm.setDetail("hypervisortoolsversion", pvdriver);
changed = true;
}
if ( changed ) {
_userVmDao.saveDetails(userVm);
}
}
}
}
public void deltaSync(Map<String, Pair<String, State>> newStates) {
Map<Long, AgentVmInfo> states = convertToInfos(newStates);