rhtyd closed pull request #2807: Remove UserVmDetailsDao duplicate field
URL: https://github.com/apache/cloudstack/pull/2807
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 86c87ed02b8..2371364aa77 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -396,7 +396,7 @@
@Inject
private SSHKeyPairDao _sshKeyPairDao;
@Inject
- private UserVmDetailsDao _vmDetailsDao;
+ private UserVmDetailsDao userVmDetailsDao;
@Inject
private HypervisorCapabilitiesDao _hypervisorCapabilitiesDao;
@Inject
@@ -450,8 +450,6 @@
@Inject
private VolumeDataFactory volFactory;
@Inject
- private UserVmDetailsDao _uservmDetailsDao;
- @Inject
private UUIDManager _uuidMgr;
@Inject
private DeploymentPlanningManager _planningMgr;
@@ -1842,7 +1840,7 @@ private boolean upgradeRunningVirtualMachine(Long vmId,
Long newServiceOfferingI
@Override
public void saveCustomOfferingDetails(long vmId, ServiceOffering
serviceOffering) {
//save the custom values to the database.
- Map<String, String> details =
_uservmDetailsDao.listDetailsKeyPairs(vmId);
+ Map<String, String> details =
userVmDetailsDao.listDetailsKeyPairs(vmId);
details.put(UsageEventVO.DynamicParameters.cpuNumber.name(),
serviceOffering.getCpu().toString());
details.put(UsageEventVO.DynamicParameters.cpuSpeed.name(),
serviceOffering.getSpeed().toString());
details.put(UsageEventVO.DynamicParameters.memory.name(),
serviceOffering.getRamSize().toString());
@@ -1851,12 +1849,12 @@ public void saveCustomOfferingDetails(long vmId,
ServiceOffering serviceOffering
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(),
entry.getValue(), true);
detailList.add(detailVO);
}
- _uservmDetailsDao.saveDetails(detailList);
+ userVmDetailsDao.saveDetails(detailList);
}
@Override
public void removeCustomOfferingDetails(long vmId) {
- Map<String, String> details =
_uservmDetailsDao.listDetailsKeyPairs(vmId);
+ Map<String, String> details =
userVmDetailsDao.listDetailsKeyPairs(vmId);
details.remove(UsageEventVO.DynamicParameters.cpuNumber.name());
details.remove(UsageEventVO.DynamicParameters.cpuSpeed.name());
details.remove(UsageEventVO.DynamicParameters.memory.name());
@@ -1865,7 +1863,7 @@ public void removeCustomOfferingDetails(long vmId) {
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(),
entry.getValue(), true);
detailList.add(detailVO);
}
- _uservmDetailsDao.saveDetails(detailList);
+ userVmDetailsDao.saveDetails(detailList);
}
@Override
@@ -2400,7 +2398,7 @@ public UserVm updateVirtualMachine(UpdateVMCmd cmd)
throws ResourceUnavailableEx
updateDisplayVmFlag(isDisplayVm, id, vmInstance);
}
if (cleanupDetails){
- _vmDetailsDao.removeDetails(id);
+ userVmDetailsDao.removeDetails(id);
}
else if (MapUtils.isNotEmpty(details)) {
vmInstance.setDetails(details);
@@ -4105,7 +4103,7 @@ private UserVm startVirtualMachine(DeployVMCmd cmd,
Map<VirtualMachineProfile.Pa
@Override
public boolean finalizeVirtualMachineProfile(VirtualMachineProfile
profile, DeployDestination dest, ReservationContext context) {
UserVmVO vm = _vmDao.findById(profile.getId());
- Map<String, String> details =
_vmDetailsDao.listDetailsKeyPairs(vm.getId());
+ Map<String, String> details =
userVmDetailsDao.listDetailsKeyPairs(vm.getId());
vm.setDetails(details);
@@ -4506,7 +4504,7 @@ public void finalizeStop(VirtualMachineProfile profile,
Answer answer) {
vm.setPassword((String)vmParamPair.second().get(VirtualMachineProfile.Param.VmPassword));
vm.setUpdateParameters(false);
if (vm.getDetail("password") != null) {
- _vmDetailsDao.remove(_vmDetailsDao.findDetail(vm.getId(),
"password").getId());
+
userVmDetailsDao.remove(userVmDetailsDao.findDetail(vm.getId(),
"password").getId());
}
_vmDao.update(vm.getId(), vm);
}
@@ -6185,7 +6183,7 @@ public UserVm restoreVMInternal(Account caller, UserVmVO
vm, Long newTemplateId)
vm.setUpdateParameters(false);
_vmDao.loadDetails(vm);
if (vm.getDetail("password") != null) {
-
_vmDetailsDao.remove(_vmDetailsDao.findDetail(vm.getId(), "password").getId());
+
userVmDetailsDao.remove(userVmDetailsDao.findDetail(vm.getId(),
"password").getId());
}
_vmDao.update(vm.getId(), vm);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
