Skip to content

Commit e392611

Browse files
shwstpprshwstppr
committed
schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details
Fixes #9975 Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 2dfe6a6 commit e392611

File tree

60 files changed

+336
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+336
-327
lines changed

‎engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile {
4040
VirtualMachine _vm;
4141
ServiceOffering _offering;
4242
VirtualMachineTemplate _template;
43-
UserVmDetailVO _userVmDetails;
43+
VMInstanceDetailVO _userVmDetails;
4444
Map<Param, Object> _params;
4545
List<NicProfile> _nics = new ArrayList<NicProfile>();
4646
List<DiskTO> _disks = new ArrayList<DiskTO>();

‎engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
import com.cloud.vm.VirtualMachine.State;
277277
import com.cloud.vm.dao.NicDao;
278278
import com.cloud.vm.dao.UserVmDao;
279-
import com.cloud.vm.dao.UserVmDetailsDao;
279+
import com.cloud.vm.dao.VMInstanceDetailsDao;
280280
import com.cloud.vm.dao.VMInstanceDao;
281281
import com.cloud.vm.snapshot.VMSnapshotManager;
282282
import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -370,7 +370,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
370370
@Inject
371371
private ClusterDetailsDao _clusterDetailsDao;
372372
@Inject
373-
private UserVmDetailsDao userVmDetailsDao;
373+
private VMInstanceDetailsDao vmInstanceDetailsDao;
374374
@Inject
375375
private VolumeOrchestrationService volumeMgr;
376376
@Inject
@@ -1340,8 +1340,8 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
13401340
_resourceMgr.updateGPUDetails(destHostId, gpuDevice.getGroupDetails());
13411341
}
13421342

1343-
if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
1344-
userVmDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
1343+
if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
1344+
vmInstanceDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
13451345
}
13461346

13471347
startedVm = vm;
@@ -1523,16 +1523,16 @@ private void updateOverCommitRatioForVmProfile(VirtualMachineProfile vmProfile,
15231523
final ClusterDetailsVO clusterDetailRam = _clusterDetailsDao.findDetail(clusterId, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
15241524
final float parsedClusterCpuDetailCpu = Float.parseFloat(clusterDetailCpu.getValue());
15251525
final float parsedClusterDetailRam = Float.parseFloat(clusterDetailRam.getValue());
1526-
UserVmDetailVO vmDetailCpu = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
1527-
UserVmDetailVO vmDetailRam = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
1526+
VMInstanceDetailVO vmDetailCpu = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
1527+
VMInstanceDetailVO vmDetailRam = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
15281528

15291529
if ((vmDetailCpu == null && parsedClusterCpuDetailCpu > 1f) ||
15301530
(vmDetailCpu != null && Float.parseFloat(vmDetailCpu.getValue()) != parsedClusterCpuDetailCpu)) {
1531-
userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
1531+
vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
15321532
}
15331533
if ((vmDetailRam == null && parsedClusterDetailRam > 1f) ||
15341534
(vmDetailRam != null && Float.parseFloat(vmDetailRam.getValue()) != parsedClusterDetailRam)) {
1535-
userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
1535+
vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
15361536
}
15371537

15381538
vmProfile.setCpuOvercommitRatio(Float.parseFloat(clusterDetailCpu.getValue()));
@@ -3275,7 +3275,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
32753275

32763276
if (defaultNic != null && VirtualMachine.Type.User.equals(vm.getType())) {
32773277
UserVmVO userVm = _userVmDao.findById(vm.getId());
3278-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
3278+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
32793279
userVm.setDetails(details);
32803280

32813281
Network network = _networkModel.getNetwork(defaultNic.getNetworkId());
@@ -4730,29 +4730,29 @@ private VMInstanceVO orchestrateReConfigureVm(String vmUuid, ServiceOffering old
47304730
}
47314731

47324732
private void removeCustomOfferingDetails(long vmId) {
4733-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
4733+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
47344734
details.remove(UsageEventVO.DynamicParameters.cpuNumber.name());
47354735
details.remove(UsageEventVO.DynamicParameters.cpuSpeed.name());
47364736
details.remove(UsageEventVO.DynamicParameters.memory.name());
4737-
List<UserVmDetailVO> detailList = new ArrayList<>();
4737+
List<VMInstanceDetailVO> detailList = new ArrayList<>();
47384738
for(Map.Entry<String, String> entry: details.entrySet()) {
4739-
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
4739+
VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
47404740
detailList.add(detailVO);
47414741
}
4742-
userVmDetailsDao.saveDetails(detailList);
4742+
vmInstanceDetailsDao.saveDetails(detailList);
47434743
}
47444744

47454745
private void saveCustomOfferingDetails(long vmId, ServiceOffering serviceOffering) {
4746-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
4746+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
47474747
details.put(UsageEventVO.DynamicParameters.cpuNumber.name(), serviceOffering.getCpu().toString());
47484748
details.put(UsageEventVO.DynamicParameters.cpuSpeed.name(), serviceOffering.getSpeed().toString());
47494749
details.put(UsageEventVO.DynamicParameters.memory.name(), serviceOffering.getRamSize().toString());
4750-
List<UserVmDetailVO> detailList = new ArrayList<>();
4750+
List<VMInstanceDetailVO> detailList = new ArrayList<>();
47514751
for (Map.Entry<String, String> entry: details.entrySet()) {
4752-
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
4752+
VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
47534753
detailList.add(detailVO);
47544754
}
4755-
userVmDetailsDao.saveDetails(detailList);
4755+
vmInstanceDetailsDao.saveDetails(detailList);
47564756
}
47574757

47584758
@Override
@@ -6071,7 +6071,7 @@ protected boolean isDiskOfferingSuitableForVm(VMInstanceVO vm, VirtualMachinePro
60716071
@Override
60726072
public Map<Long, Boolean> getDiskOfferingSuitabilityForVm(long vmId, List<Long> diskOfferingIds) {
60736073
VMInstanceVO vm = _vmDao.findById(vmId);
6074-
if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
6074+
if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
60756075
return new HashMap<>();
60766076
}
60776077
VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);

‎engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import com.cloud.vm.VMInstanceVO;
5959
import com.cloud.vm.VirtualMachineManager;
6060
import com.cloud.vm.dao.UserVmDao;
61-
import com.cloud.vm.dao.UserVmDetailsDao;
61+
import com.cloud.vm.dao.VMInstanceDetailsDao;
6262
import com.cloud.vm.dao.VMInstanceDao;
6363

6464
import static org.apache.cloudstack.api.ApiConstants.MAX_IOPS;
@@ -83,7 +83,7 @@ public class CloudOrchestrator implements OrchestrationService {
8383
protected UserVmDao _userVmDao = null;
8484

8585
@Inject
86-
protected UserVmDetailsDao _userVmDetailsDao = null;
86+
protected VMInstanceDetailsDao _vmInstanceDetailsDao = null;
8787

8888
@Inject
8989
protected ServiceOfferingDao _serviceOfferingDao;
@@ -196,7 +196,7 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
196196
rootDiskOfferingInfo.setSize(rootDiskSize);
197197

198198
if (rootDiskOffering.isCustomizedIops() != null && rootDiskOffering.isCustomizedIops()) {
199-
Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
199+
Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
200200

201201
if (userVmDetails != null) {
202202
String minIops = userVmDetails.get(MIN_IOPS);
@@ -228,7 +228,7 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
228228
dataDiskOfferingInfo.setSize(size);
229229

230230
if (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) {
231-
Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
231+
Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
232232

233233
if (userVmDetails != null) {
234234
String minIops = userVmDetails.get("minIopsDo");
@@ -300,7 +300,7 @@ public VirtualMachineEntity createVirtualMachineFromScratch(String id, String ow
300300
rootDiskOfferingInfo.setSize(size);
301301

302302
if (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) {
303-
Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
303+
Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
304304

305305
if (userVmDetails != null) {
306306
String minIops = userVmDetails.get("minIopsDo");

‎engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
import com.cloud.vm.DiskProfile;
162162
import com.cloud.vm.SecondaryStorageVmVO;
163163
import com.cloud.vm.UserVmCloneSettingVO;
164-
import com.cloud.vm.UserVmDetailVO;
164+
import com.cloud.vm.VMInstanceDetailVO;
165165
import com.cloud.vm.UserVmVO;
166166
import com.cloud.vm.VMInstanceVO;
167167
import com.cloud.vm.VirtualMachine;
@@ -176,7 +176,7 @@
176176
import com.cloud.vm.dao.SecondaryStorageVmDao;
177177
import com.cloud.vm.dao.UserVmCloneSettingDao;
178178
import com.cloud.vm.dao.UserVmDao;
179-
import com.cloud.vm.dao.UserVmDetailsDao;
179+
import com.cloud.vm.dao.VMInstanceDetailsDao;
180180

181181
public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrationService, Configurable {
182182

@@ -246,7 +246,7 @@ public enum UserVmCloneType {
246246
@Inject
247247
TemplateService templateService;
248248
@Inject
249-
UserVmDetailsDao userVmDetailsDao;
249+
VMInstanceDetailsDao vmInstanceDetailsDao;
250250
@Inject
251251
private SecondaryStorageVmDao secondaryStorageVmDao;
252252
@Inject
@@ -990,7 +990,7 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
990990
logger.info("Could not find a running SSVM in datacenter [{}] for deploying VM as is. Not deploying VM [{}] as is.",
991991
vm.getDataCenterId(), vm);
992992
} else {
993-
UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
993+
VMInstanceDetailVO configurationDetail = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
994994
if (configurationDetail != null) {
995995
configurationId = configurationDetail.getValue();
996996
}
@@ -1059,13 +1059,13 @@ private void handleRootDiskControllerTpeForDeployAsIs(List<DatadiskTO> disksAsIs
10591059
String diskControllerSubType = disksAsIs.get(0).getDiskControllerSubType();
10601060
if (StringUtils.isNotBlank(diskControllerSubType)) {
10611061
long vmId = vm.getId();
1062-
UserVmDetailVO detail = userVmDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
1062+
VMInstanceDetailVO detail = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
10631063
if (detail != null) {
10641064
detail.setValue(diskControllerSubType);
1065-
userVmDetailsDao.update(detail.getId(), detail);
1065+
vmInstanceDetailsDao.update(detail.getId(), detail);
10661066
} else {
1067-
detail = new UserVmDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1068-
userVmDetailsDao.persist(detail);
1067+
detail = new VMInstanceDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1068+
vmInstanceDetailsDao.persist(detail);
10691069
}
10701070
}
10711071
}
@@ -1554,7 +1554,7 @@ private Map<String, String> getDetails(VolumeInfo volumeInfo, DataStore dataStor
15541554

15551555
private void setIoDriverPolicy(Map<String, String> details, StoragePoolVO storagePool, VolumeVO volume) {
15561556
if (volume.getInstanceId() != null) {
1557-
UserVmDetailVO ioDriverPolicy = userVmDetailsDao.findDetail(volume.getInstanceId(),
1557+
VMInstanceDetailVO ioDriverPolicy = vmInstanceDetailsDao.findDetail(volume.getInstanceId(),
15581558
VmDetailConstants.IO_POLICY);
15591559
if (ioDriverPolicy != null) {
15601560
if (IoDriverPolicy.STORAGE_SPECIFIC.toString().equals(ioDriverPolicy.getValue())) {

‎engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
import com.cloud.utils.fsm.StateMachine2;
128128
import com.cloud.vm.VirtualMachine.State;
129129
import com.cloud.vm.dao.UserVmDao;
130-
import com.cloud.vm.dao.UserVmDetailsDao;
130+
import com.cloud.vm.dao.VMInstanceDetailsDao;
131131
import com.cloud.vm.dao.VMInstanceDao;
132132

133133
@RunWith(MockitoJUnitRunner.class)
@@ -217,7 +217,7 @@ public class VirtualMachineManagerImplTest {
217217
@Mock
218218
private ClusterDetailsDao _clusterDetailsDao;
219219
@Mock
220-
private UserVmDetailsDao userVmDetailsDao;
220+
private VMInstanceDetailsDao vmInstanceDetailsDao;
221221
@Mock
222222
private ItWorkDao _workDao;
223223
@Mock
@@ -1091,7 +1091,7 @@ public void testOrchestrateStartNonNullPodId() throws Exception {
10911091
when(cluster.getId()).thenReturn(1L);
10921092
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
10931093
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
1094-
when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
1094+
when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
10951095
when(cluster_detail_cpu.getValue()).thenReturn("1.0");
10961096
when(cluster_detail_ram.getValue()).thenReturn("1.0");
10971097
doReturn(false).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
@@ -1187,7 +1187,7 @@ public void testOrchestrateStartNullPodId() throws Exception {
11871187
when(cluster.getId()).thenReturn(1L);
11881188
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
11891189
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
1190-
when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
1190+
when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
11911191
when(cluster_detail_cpu.getValue()).thenReturn("1.0");
11921192
when(cluster_detail_ram.getValue()).thenReturn("1.0");
11931193
doReturn(true).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());

‎engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import com.cloud.utils.db.SearchCriteria;
4040
import com.cloud.utils.exception.CloudRuntimeException;
4141
import com.cloud.vm.VirtualMachine;
42-
import com.cloud.vm.dao.UserVmDetailsDao;
42+
import com.cloud.vm.dao.VMInstanceDetailsDao;
4343

4444
@Component
4545
@DB()
@@ -48,7 +48,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
4848
@Inject
4949
protected ServiceOfferingDetailsDao detailsDao;
5050
@Inject
51-
protected UserVmDetailsDao userVmDetailsDao;
51+
protected VMInstanceDetailsDao vmInstanceDetailsDao;
5252
@Inject
5353
private DiskOfferingDao diskOfferingDao;
5454

@@ -176,7 +176,7 @@ public ServiceOfferingVO findById(Long vmId, long serviceOfferingId) {
176176
if (vmId == null) {
177177
throw new CloudRuntimeException("missing argument vmId");
178178
}
179-
Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
179+
Map<String, String> dynamicOffering = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
180180
return getComputeOffering(offering, dynamicOffering);
181181
}
182182
return offering;
@@ -190,7 +190,7 @@ public ServiceOfferingVO findByIdIncludingRemoved(Long vmId, long serviceOfferin
190190
if (vmId == null) {
191191
throw new CloudRuntimeException("missing argument vmId");
192192
}
193-
Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
193+
Map<String, String> dynamicOffering = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
194194
return getComputeOffering(offering, dynamicOffering);
195195
}
196196
return offering;

‎engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java‎ renamed to ‎engine/schema/src/main/java/com/cloud/vm/VMInstanceDetailVO.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.apache.cloudstack.api.ResourceDetail;
2727

2828
@Entity
29-
@Table(name = "user_vm_details")
30-
public class UserVmDetailVO implements ResourceDetail {
29+
@Table(name = "vm_instance_details")
30+
public class VMInstanceDetailVO implements ResourceDetail {
3131
@Id
3232
@GeneratedValue(strategy = GenerationType.IDENTITY)
3333
@Column(name = "id")
@@ -45,10 +45,10 @@ public class UserVmDetailVO implements ResourceDetail {
4545
@Column(name = "display")
4646
private boolean display = true;
4747

48-
public UserVmDetailVO() {
48+
public VMInstanceDetailVO() {
4949
}
5050

51-
public UserVmDetailVO(long vmId, String name, String value, boolean display) {
51+
public VMInstanceDetailVO(long vmId, String name, String value, boolean display) {
5252
this.resourceId = vmId;
5353
this.name = name;
5454
this.value = value;

‎engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import com.cloud.utils.db.TransactionLegacy;
5858
import com.cloud.utils.exception.CloudRuntimeException;
5959
import com.cloud.vm.NicVO;
60-
import com.cloud.vm.UserVmDetailVO;
60+
import com.cloud.vm.VMInstanceDetailVO;
6161
import com.cloud.vm.UserVmVO;
6262
import com.cloud.vm.VirtualMachine;
6363
import com.cloud.vm.VirtualMachine.State;
@@ -130,7 +130,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
130130
private static final int VM_DETAILS_BATCH_SIZE = 100;
131131

132132
@Inject
133-
protected UserVmDetailsDao _detailsDao;
133+
protected VMInstanceDetailsDao _detailsDao;
134134
@Inject
135135
protected NicDao _nicDao;
136136

@@ -445,10 +445,10 @@ public void saveDetails(UserVmVO vm, List<String> hiddenDetails) {
445445

446446
final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
447447

448-
List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
448+
List<VMInstanceDetailVO> details = new ArrayList<VMInstanceDetailVO>();
449449
for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
450450
boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
451-
details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
451+
details.add(new VMInstanceDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
452452
}
453453

454454
_detailsDao.saveDetails(details);

‎engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java‎ renamed to ‎engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDao.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
2020

2121
import com.cloud.utils.db.GenericDao;
22-
import com.cloud.vm.UserVmDetailVO;
22+
import com.cloud.vm.VMInstanceDetailVO;
2323

24-
public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long>, ResourceDetailsDao<UserVmDetailVO> {
24+
public interface VMInstanceDetailsDao extends GenericDao<VMInstanceDetailVO, Long>, ResourceDetailsDao<VMInstanceDetailVO> {
2525
}

0 commit comments

Comments
 (0)