Skip to content

Commit 328506e

Browse files
shwstpprsureshanapartiDaanHoogland
authored and
dhslove
committed
schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details (apache#10736)
Signed-off-by: Abhishek Kumar <[email protected]> Co-authored-by: Suresh Kumar Anaparti <[email protected]> Co-authored-by: dahn <[email protected]>
1 parent a872a0b commit 328506e

File tree

66 files changed

+529
-493
lines changed

Some content is hidden

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

66 files changed

+529
-493
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
@@ -287,7 +287,7 @@
287287
import com.cloud.vm.VirtualMachine.State;
288288
import com.cloud.vm.dao.NicDao;
289289
import com.cloud.vm.dao.UserVmDao;
290-
import com.cloud.vm.dao.UserVmDetailsDao;
290+
import com.cloud.vm.dao.VMInstanceDetailsDao;
291291
import com.cloud.vm.dao.VMInstanceDao;
292292
import com.cloud.vm.snapshot.VMSnapshotManager;
293293
import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -382,7 +382,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
382382
@Inject
383383
private ClusterDetailsDao _clusterDetailsDao;
384384
@Inject
385-
private UserVmDetailsDao userVmDetailsDao;
385+
private VMInstanceDetailsDao vmInstanceDetailsDao;
386386
@Inject
387387
private VolumeOrchestrationService volumeMgr;
388388
@Inject
@@ -1379,8 +1379,8 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
13791379
_resourceMgr.updateGPUDetails(destHostId, gpuDevice.getGroupDetails());
13801380
}
13811381

1382-
if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
1383-
userVmDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
1382+
if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
1383+
vmInstanceDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
13841384
}
13851385

13861386
startedVm = vm;
@@ -1562,16 +1562,16 @@ private void updateOverCommitRatioForVmProfile(VirtualMachineProfile vmProfile,
15621562
final ClusterDetailsVO clusterDetailRam = _clusterDetailsDao.findDetail(clusterId, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
15631563
final float parsedClusterCpuDetailCpu = Float.parseFloat(clusterDetailCpu.getValue());
15641564
final float parsedClusterDetailRam = Float.parseFloat(clusterDetailRam.getValue());
1565-
UserVmDetailVO vmDetailCpu = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
1566-
UserVmDetailVO vmDetailRam = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
1565+
VMInstanceDetailVO vmDetailCpu = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
1566+
VMInstanceDetailVO vmDetailRam = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
15671567

15681568
if ((vmDetailCpu == null && parsedClusterCpuDetailCpu > 1f) ||
15691569
(vmDetailCpu != null && Float.parseFloat(vmDetailCpu.getValue()) != parsedClusterCpuDetailCpu)) {
1570-
userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
1570+
vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
15711571
}
15721572
if ((vmDetailRam == null && parsedClusterDetailRam > 1f) ||
15731573
(vmDetailRam != null && Float.parseFloat(vmDetailRam.getValue()) != parsedClusterDetailRam)) {
1574-
userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
1574+
vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
15751575
}
15761576

15771577
vmProfile.setCpuOvercommitRatio(Float.parseFloat(clusterDetailCpu.getValue()));
@@ -3338,7 +3338,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
33383338

33393339
if (defaultNic != null && VirtualMachine.Type.User.equals(vm.getType())) {
33403340
UserVmVO userVm = _userVmDao.findById(vm.getId());
3341-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
3341+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
33423342
userVm.setDetails(details);
33433343

33443344
Network network = _networkModel.getNetwork(defaultNic.getNetworkId());
@@ -4856,29 +4856,29 @@ private VMInstanceVO orchestrateReConfigureVm(String vmUuid, ServiceOffering old
48564856
}
48574857

48584858
private void removeCustomOfferingDetails(long vmId) {
4859-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
4859+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
48604860
details.remove(UsageEventVO.DynamicParameters.cpuNumber.name());
48614861
details.remove(UsageEventVO.DynamicParameters.cpuSpeed.name());
48624862
details.remove(UsageEventVO.DynamicParameters.memory.name());
4863-
List<UserVmDetailVO> detailList = new ArrayList<>();
4863+
List<VMInstanceDetailVO> detailList = new ArrayList<>();
48644864
for(Map.Entry<String, String> entry: details.entrySet()) {
4865-
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
4865+
VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
48664866
detailList.add(detailVO);
48674867
}
4868-
userVmDetailsDao.saveDetails(detailList);
4868+
vmInstanceDetailsDao.saveDetails(detailList);
48694869
}
48704870

48714871
private void saveCustomOfferingDetails(long vmId, ServiceOffering serviceOffering) {
4872-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
4872+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
48734873
details.put(UsageEventVO.DynamicParameters.cpuNumber.name(), serviceOffering.getCpu().toString());
48744874
details.put(UsageEventVO.DynamicParameters.cpuSpeed.name(), serviceOffering.getSpeed().toString());
48754875
details.put(UsageEventVO.DynamicParameters.memory.name(), serviceOffering.getRamSize().toString());
4876-
List<UserVmDetailVO> detailList = new ArrayList<>();
4876+
List<VMInstanceDetailVO> detailList = new ArrayList<>();
48774877
for (Map.Entry<String, String> entry: details.entrySet()) {
4878-
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
4878+
VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
48794879
detailList.add(detailVO);
48804880
}
4881-
userVmDetailsDao.saveDetails(detailList);
4881+
vmInstanceDetailsDao.saveDetails(detailList);
48824882
}
48834883

48844884
@Override
@@ -6196,7 +6196,7 @@ protected boolean isDiskOfferingSuitableForVm(VMInstanceVO vm, VirtualMachinePro
61966196
@Override
61976197
public Map<Long, Boolean> getDiskOfferingSuitabilityForVm(long vmId, List<Long> diskOfferingIds) {
61986198
VMInstanceVO vm = _vmDao.findById(vmId);
6199-
if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
6199+
if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
62006200
return new HashMap<>();
62016201
}
62026202
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
@@ -61,7 +61,7 @@
6161
import com.cloud.vm.VMInstanceVO;
6262
import com.cloud.vm.VirtualMachineManager;
6363
import com.cloud.vm.dao.UserVmDao;
64-
import com.cloud.vm.dao.UserVmDetailsDao;
64+
import com.cloud.vm.dao.VMInstanceDetailsDao;
6565
import com.cloud.vm.dao.VMInstanceDao;
6666

6767
import static org.apache.cloudstack.api.ApiConstants.MAX_IOPS;
@@ -86,7 +86,7 @@ public class CloudOrchestrator implements OrchestrationService {
8686
protected UserVmDao _userVmDao = null;
8787

8888
@Inject
89-
protected UserVmDetailsDao _userVmDetailsDao = null;
89+
protected VMInstanceDetailsDao _vmInstanceDetailsDao = null;
9090

9191
@Inject
9292
protected ServiceOfferingDao _serviceOfferingDao;
@@ -199,7 +199,7 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
199199
rootDiskOfferingInfo.setSize(rootDiskSize);
200200

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

204204
if (userVmDetails != null) {
205205
String minIops = userVmDetails.get(MIN_IOPS);
@@ -231,7 +231,7 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
231231
dataDiskOfferingInfo.setSize(size);
232232

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

236236
if (userVmDetails != null) {
237237
String minIops = userVmDetails.get("minIopsDo");
@@ -308,7 +308,7 @@ public VirtualMachineEntity createVirtualMachineFromScratch(String id, String ow
308308
rootDiskOfferingInfo.setSize(size);
309309

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

313313
if (userVmDetails != null) {
314314
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
@@ -168,7 +168,7 @@
168168
import com.cloud.vm.DiskProfile;
169169
import com.cloud.vm.SecondaryStorageVmVO;
170170
import com.cloud.vm.UserVmCloneSettingVO;
171-
import com.cloud.vm.UserVmDetailVO;
171+
import com.cloud.vm.VMInstanceDetailVO;
172172
import com.cloud.vm.UserVmVO;
173173
import com.cloud.vm.VMInstanceVO;
174174
import com.cloud.vm.VirtualMachine;
@@ -183,7 +183,7 @@
183183
import com.cloud.vm.dao.SecondaryStorageVmDao;
184184
import com.cloud.vm.dao.UserVmCloneSettingDao;
185185
import com.cloud.vm.dao.UserVmDao;
186-
import com.cloud.vm.dao.UserVmDetailsDao;
186+
import com.cloud.vm.dao.VMInstanceDetailsDao;
187187

188188
public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrationService, Configurable {
189189

@@ -255,7 +255,7 @@ public enum UserVmCloneType {
255255
@Inject
256256
TemplateService templateService;
257257
@Inject
258-
UserVmDetailsDao userVmDetailsDao;
258+
VMInstanceDetailsDao vmInstanceDetailsDao;
259259
@Inject
260260
private SecondaryStorageVmDao secondaryStorageVmDao;
261261
@Inject
@@ -1241,7 +1241,7 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
12411241
logger.info("Could not find a running SSVM in datacenter [{}] for deploying VM as is. Not deploying VM [{}] as is.",
12421242
vm.getDataCenterId(), vm);
12431243
} else {
1244-
UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
1244+
VMInstanceDetailVO configurationDetail = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
12451245
if (configurationDetail != null) {
12461246
configurationId = configurationDetail.getValue();
12471247
}
@@ -1310,13 +1310,13 @@ private void handleRootDiskControllerTpeForDeployAsIs(List<DatadiskTO> disksAsIs
13101310
String diskControllerSubType = disksAsIs.get(0).getDiskControllerSubType();
13111311
if (StringUtils.isNotBlank(diskControllerSubType)) {
13121312
long vmId = vm.getId();
1313-
UserVmDetailVO detail = userVmDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
1313+
VMInstanceDetailVO detail = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
13141314
if (detail != null) {
13151315
detail.setValue(diskControllerSubType);
1316-
userVmDetailsDao.update(detail.getId(), detail);
1316+
vmInstanceDetailsDao.update(detail.getId(), detail);
13171317
} else {
1318-
detail = new UserVmDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1319-
userVmDetailsDao.persist(detail);
1318+
detail = new VMInstanceDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1319+
vmInstanceDetailsDao.persist(detail);
13201320
}
13211321
}
13221322
}
@@ -1805,7 +1805,7 @@ private Map<String, String> getDetails(VolumeInfo volumeInfo, DataStore dataStor
18051805

18061806
private void setIoDriverPolicy(Map<String, String> details, StoragePoolVO storagePool, VolumeVO volume) {
18071807
if (volume.getInstanceId() != null) {
1808-
UserVmDetailVO ioDriverPolicy = userVmDetailsDao.findDetail(volume.getInstanceId(),
1808+
VMInstanceDetailVO ioDriverPolicy = vmInstanceDetailsDao.findDetail(volume.getInstanceId(),
18091809
VmDetailConstants.IO_POLICY);
18101810
if (ioDriverPolicy != null) {
18111811
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
@@ -131,7 +131,7 @@
131131
import com.cloud.utils.fsm.StateMachine2;
132132
import com.cloud.vm.VirtualMachine.State;
133133
import com.cloud.vm.dao.UserVmDao;
134-
import com.cloud.vm.dao.UserVmDetailsDao;
134+
import com.cloud.vm.dao.VMInstanceDetailsDao;
135135
import com.cloud.vm.dao.VMInstanceDao;
136136

137137
@RunWith(MockitoJUnitRunner.class)
@@ -224,7 +224,7 @@ public class VirtualMachineManagerImplTest {
224224
@Mock
225225
private ClusterDetailsDao _clusterDetailsDao;
226226
@Mock
227-
private UserVmDetailsDao userVmDetailsDao;
227+
private VMInstanceDetailsDao vmInstanceDetailsDao;
228228
@Mock
229229
private ItWorkDao _workDao;
230230
@Mock
@@ -1098,7 +1098,7 @@ public void testOrchestrateStartNonNullPodId() throws Exception {
10981098
when(cluster.getId()).thenReturn(1L);
10991099
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
11001100
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
1101-
when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
1101+
when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
11021102
when(cluster_detail_cpu.getValue()).thenReturn("1.0");
11031103
when(cluster_detail_ram.getValue()).thenReturn("1.0");
11041104
doReturn(false).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
@@ -1194,7 +1194,7 @@ public void testOrchestrateStartNullPodId() throws Exception {
11941194
when(cluster.getId()).thenReturn(1L);
11951195
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
11961196
when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
1197-
when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
1197+
when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
11981198
when(cluster_detail_cpu.getValue()).thenReturn("1.0");
11991199
when(cluster_detail_ram.getValue()).thenReturn("1.0");
12001200
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)