Skip to content

Commit 9463711

Browse files
abh1sarabh1sar
committed
Merge remote-tracking branch 'upstream/main' into instance
2 parents 85f86be + 22b753e commit 9463711

File tree

82 files changed

+688
-663
lines changed

Some content is hidden

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

82 files changed

+688
-663
lines changed

‎.github/linters/.markdown-lint.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ MD046: false
8686

8787
# MD052/reference-links-images Reference links and images should use a label that is defined
8888
MD052: false
89+
90+
# MD059/descriptive-link-text Link text should be descriptive
91+
MD059: false

‎.pre-commit-config.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ repos:
2525
hooks:
2626
- id: identity
2727
- id: check-hooks-apply
28+
- repo: https://github.com/gitleaks/gitleaks
29+
rev: v8.27.2
30+
hooks:
31+
- id: gitleaks
32+
name: run gitleaks
33+
description: detect hardcoded secrets
2834
- repo: https://github.com/pre-commit/pre-commit-hooks
2935
rev: v4.6.0
3036
hooks:
@@ -87,7 +93,7 @@ repos:
8793
^setup/bindir/cloud-setup-encryption\.in$|
8894
^venv/.*$
8995
- repo: https://github.com/igorshubovych/markdownlint-cli
90-
rev: v0.43.0
96+
rev: v0.45.0
9197
hooks:
9298
- id: markdownlint
9399
name: run markdownlint

‎api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@EntityReference(value = BackupSchedule.class)
3030
public class BackupScheduleResponse extends BaseResponse {
3131
@SerializedName(ApiConstants.ID)
32-
@Param(description = "ID of the backup schedule.")
32+
@Param(description = "ID of the backup schedule.", since = "4.21.0")
3333
private String id;
3434

3535
@SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)

‎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
@@ -288,7 +288,7 @@
288288
import com.cloud.vm.VirtualMachine.State;
289289
import com.cloud.vm.dao.NicDao;
290290
import com.cloud.vm.dao.UserVmDao;
291-
import com.cloud.vm.dao.UserVmDetailsDao;
291+
import com.cloud.vm.dao.VMInstanceDetailsDao;
292292
import com.cloud.vm.dao.VMInstanceDao;
293293
import com.cloud.vm.snapshot.VMSnapshotManager;
294294
import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -383,7 +383,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
383383
@Inject
384384
private ClusterDetailsDao _clusterDetailsDao;
385385
@Inject
386-
private UserVmDetailsDao userVmDetailsDao;
386+
private VMInstanceDetailsDao vmInstanceDetailsDao;
387387
@Inject
388388
private VolumeOrchestrationService volumeMgr;
389389
@Inject
@@ -1380,8 +1380,8 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
13801380
_resourceMgr.updateGPUDetails(destHostId, gpuDevice.getGroupDetails());
13811381
}
13821382

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

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

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

15781578
vmProfile.setCpuOvercommitRatio(Float.parseFloat(clusterDetailCpu.getValue()));
@@ -3335,7 +3335,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
33353335

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

33413341
Network network = _networkModel.getNetwork(defaultNic.getNetworkId());
@@ -4853,29 +4853,29 @@ private VMInstanceVO orchestrateReConfigureVm(String vmUuid, ServiceOffering old
48534853
}
48544854

48554855
private void removeCustomOfferingDetails(long vmId) {
4856-
Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
4856+
Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
48574857
details.remove(UsageEventVO.DynamicParameters.cpuNumber.name());
48584858
details.remove(UsageEventVO.DynamicParameters.cpuSpeed.name());
48594859
details.remove(UsageEventVO.DynamicParameters.memory.name());
4860-
List<UserVmDetailVO> detailList = new ArrayList<>();
4860+
List<VMInstanceDetailVO> detailList = new ArrayList<>();
48614861
for(Map.Entry<String, String> entry: details.entrySet()) {
4862-
UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
4862+
VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
48634863
detailList.add(detailVO);
48644864
}
4865-
userVmDetailsDao.saveDetails(detailList);
4865+
vmInstanceDetailsDao.saveDetails(detailList);
48664866
}
48674867

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

48814881
@Override
@@ -6193,7 +6193,7 @@ protected boolean isDiskOfferingSuitableForVm(VMInstanceVO vm, VirtualMachinePro
61936193
@Override
61946194
public Map<Long, Boolean> getDiskOfferingSuitabilityForVm(long vmId, List<Long> diskOfferingIds) {
61956195
VMInstanceVO vm = _vmDao.findById(vmId);
6196-
if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
6196+
if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
61976197
return new HashMap<>();
61986198
}
61996199
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
@@ -62,7 +62,7 @@
6262
import com.cloud.vm.VirtualMachineManager;
6363
import com.cloud.vm.VmDiskInfo;
6464
import com.cloud.vm.dao.UserVmDao;
65-
import com.cloud.vm.dao.UserVmDetailsDao;
65+
import com.cloud.vm.dao.VMInstanceDetailsDao;
6666
import com.cloud.vm.dao.VMInstanceDao;
6767

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

8989
@Inject
90-
protected UserVmDetailsDao _userVmDetailsDao = null;
90+
protected VMInstanceDetailsDao _vmInstanceDetailsDao = null;
9191

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

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

205205
if (userVmDetails != null) {
206206
String minIops = userVmDetails.get(MIN_IOPS);
@@ -234,7 +234,7 @@ public VirtualMachineEntity createVirtualMachine(String id, String owner, String
234234
dataDiskOfferingInfo.setSize(size);
235235

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

239239
if (userVmDetails != null) {
240240
String minIops = userVmDetails.get("minIopsDo");
@@ -316,7 +316,7 @@ public VirtualMachineEntity createVirtualMachineFromScratch(String id, String ow
316316
rootDiskOfferingInfo.setSize(size);
317317

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

321321
if (userVmDetails != null) {
322322
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
@@ -1057,7 +1057,7 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
10571057
logger.info("Could not find a running SSVM in datacenter [{}] for deploying VM as is. Not deploying VM [{}] as is.",
10581058
vm.getDataCenterId(), vm);
10591059
} else {
1060-
UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
1060+
VMInstanceDetailVO configurationDetail = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
10611061
if (configurationDetail != null) {
10621062
configurationId = configurationDetail.getValue();
10631063
}
@@ -1126,13 +1126,13 @@ private void handleRootDiskControllerTpeForDeployAsIs(List<DatadiskTO> disksAsIs
11261126
String diskControllerSubType = disksAsIs.get(0).getDiskControllerSubType();
11271127
if (StringUtils.isNotBlank(diskControllerSubType)) {
11281128
long vmId = vm.getId();
1129-
UserVmDetailVO detail = userVmDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
1129+
VMInstanceDetailVO detail = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
11301130
if (detail != null) {
11311131
detail.setValue(diskControllerSubType);
1132-
userVmDetailsDao.update(detail.getId(), detail);
1132+
vmInstanceDetailsDao.update(detail.getId(), detail);
11331133
} else {
1134-
detail = new UserVmDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1135-
userVmDetailsDao.persist(detail);
1134+
detail = new VMInstanceDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
1135+
vmInstanceDetailsDao.persist(detail);
11361136
}
11371137
}
11381138
}
@@ -1621,7 +1621,7 @@ private Map<String, String> getDetails(VolumeInfo volumeInfo, DataStore dataStor
16211621

16221622
private void setIoDriverPolicy(Map<String, String> details, StoragePoolVO storagePool, VolumeVO volume) {
16231623
if (volume.getInstanceId() != null) {
1624-
UserVmDetailVO ioDriverPolicy = userVmDetailsDao.findDetail(volume.getInstanceId(),
1624+
VMInstanceDetailVO ioDriverPolicy = vmInstanceDetailsDao.findDetail(volume.getInstanceId(),
16251625
VmDetailConstants.IO_POLICY);
16261626
if (ioDriverPolicy != null) {
16271627
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;

0 commit comments

Comments
 (0)