Skip to content

Commit 21a3662

Browse files
PrashantBhanageDaanHoogland
PrashantBhanage
authored and
DaanHoogland
committed
Fix: Remove invalid .toString() type mismatch in usage entity lookups
1 parent 23b612b commit 21a3662

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

‎server/src/main/java/com/cloud/api/ApiResponseHelper.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4280,7 +4280,7 @@ private UsageResourceDetails populateUsageTypeSpecificDetails(Usage usageRecord,
42804280
private UsageResourceDetails populateRunningOrAllocatedVmUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat,
42814281
VMInstanceVO vmInstance, VMTemplateVO template) {
42824282
UsageResourceDetails resourceDetails = new UsageResourceDetails();
4283-
ServiceOfferingVO svcOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, usageRecord.getOfferingId().toString());
4283+
ServiceOfferingVO svcOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, usageRecord.getOfferingId());
42844284
//Service Offering Id
42854285
if(svcOffering != null) {
42864286
usageRecResponse.setOfferingId(svcOffering.getUuid());
@@ -4290,7 +4290,7 @@ private UsageResourceDetails populateRunningOrAllocatedVmUsageResponse(Usage usa
42904290
if (usageRecord.getUsageId() != null && usageRecord.getUsageId().equals(usageRecord.getVmInstanceId())) {
42914291
vm = vmInstance;
42924292
} else {
4293-
vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId().toString());
4293+
vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId());
42944294
}
42954295
if (vm != null) {
42964296
resourceDetails.resourceType = ResourceTag.ResourceObjectType.UserVm;
@@ -4349,7 +4349,7 @@ private UsageResourceDetails populateRunningOrAllocatedVmUsageResponse(Usage usa
43494349
private UsageResourceDetails populateIpAddressUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse) {
43504350
UsageResourceDetails resourceDetails = new UsageResourceDetails();
43514351
//IP Address ID
4352-
IPAddressVO ip = _entityMgr.findByIdIncludingRemoved(IPAddressVO.class, usageRecord.getUsageId().toString());
4352+
IPAddressVO ip = _entityMgr.findByIdIncludingRemoved(IPAddressVO.class, usageRecord.getUsageId());
43534353
if (ip != null) {
43544354
resourceDetails.resourceType = ResourceObjectType.PublicIpAddress;
43554355
resourceDetails.resourceId = ip.getId();
@@ -4371,22 +4371,22 @@ private UsageResourceDetails populateNetworkBytesUsageResponse(Usage usageRecord
43714371
HostVO host = null;
43724372
if (usageRecord.getType().equals("DomainRouter") || usageRecord.getType().equals("UserVm")) {
43734373
//Domain Router Id
4374-
vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId().toString());
4374+
vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId());
43754375
if (vm != null) {
43764376
resourceDetails.resourceId = vm.getId();
43774377
usageRecResponse.setUsageId(vm.getUuid());
43784378
}
43794379
} else {
43804380
//External Device Host Id
4381-
host = _entityMgr.findByIdIncludingRemoved(HostVO.class, usageRecord.getUsageId().toString());
4381+
host = _entityMgr.findByIdIncludingRemoved(HostVO.class, usageRecord.getUsageId());
43824382
if (host != null) {
43834383
usageRecResponse.setUsageId(host.getUuid());
43844384
}
43854385
}
43864386
//Network ID
43874387
NetworkVO network = null;
43884388
if((usageRecord.getNetworkId() != null) && (usageRecord.getNetworkId() != 0)) {
4389-
network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString());
4389+
network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId());
43904390
if (network != null) {
43914391
resourceDetails.resourceType = ResourceObjectType.Network;
43924392
if (network.getTrafficType() == TrafficType.Public) {
@@ -4438,7 +4438,7 @@ private UsageResourceDetails populateVmDiskUsageResponse(Usage usageRecord, Usag
44384438
usageRecResponse.setType(usageRecord.getType());
44394439
resourceDetails.resourceType = ResourceObjectType.Volume;
44404440
//Volume ID
4441-
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
4441+
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
44424442
if (volume != null) {
44434443
usageRecResponse.setUsageId(volume.getUuid());
44444444
resourceDetails.resourceId = volume.getId();
@@ -4472,7 +4472,7 @@ private UsageResourceDetails populateVolumeUsageResponse(Usage usageRecord, Usag
44724472
VMInstanceVO vmInstance, VMTemplateVO template) {
44734473
UsageResourceDetails resourceDetails = new UsageResourceDetails();
44744474
//Volume ID
4475-
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
4475+
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
44764476
resourceDetails.resourceType = ResourceObjectType.Volume;
44774477
if (volume != null) {
44784478
usageRecResponse.setUsageId(volume.getUuid());
@@ -4483,7 +4483,7 @@ private UsageResourceDetails populateVolumeUsageResponse(Usage usageRecord, Usag
44834483
//Disk Offering Id
44844484
DiskOfferingVO diskOff = null;
44854485
if (usageRecord.getOfferingId() != null) {
4486-
diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId().toString());
4486+
diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId());
44874487
if (diskOff != null) {
44884488
usageRecResponse.setOfferingId(diskOff.getUuid());
44894489
}
@@ -4514,7 +4514,7 @@ private UsageResourceDetails populateVolumeUsageResponse(Usage usageRecord, Usag
45144514
private UsageResourceDetails populateTemplateOrIsoUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
45154515
UsageResourceDetails resourceDetails = new UsageResourceDetails();
45164516
//Template/ISO ID
4517-
VMTemplateVO tmpl = _entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, usageRecord.getUsageId().toString());
4517+
VMTemplateVO tmpl = _entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, usageRecord.getUsageId());
45184518
if (tmpl != null) {
45194519
usageRecResponse.setUsageId(tmpl.getUuid());
45204520
resourceDetails.resourceId = tmpl.getId();
@@ -4547,7 +4547,7 @@ private UsageResourceDetails populateTemplateOrIsoUsageResponse(Usage usageRecor
45474547
private UsageResourceDetails populateSnapshotUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
45484548
UsageResourceDetails resourceDetails = new UsageResourceDetails();
45494549
//Snapshot ID
4550-
SnapshotVO snap = _entityMgr.findByIdIncludingRemoved(SnapshotVO.class, usageRecord.getUsageId().toString());
4550+
SnapshotVO snap = _entityMgr.findByIdIncludingRemoved(SnapshotVO.class, usageRecord.getUsageId());
45514551
resourceDetails.resourceType = ResourceObjectType.Snapshot;
45524552
if (snap != null) {
45534553
usageRecResponse.setUsageId(snap.getUuid());
@@ -4570,7 +4570,7 @@ private UsageResourceDetails populateSnapshotUsageResponse(Usage usageRecord, Us
45704570
private UsageResourceDetails populateLoadBalancerPolicyUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
45714571
UsageResourceDetails resourceDetails = new UsageResourceDetails();
45724572
//Load Balancer Policy ID
4573-
LoadBalancerVO lb = _entityMgr.findByIdIncludingRemoved(LoadBalancerVO.class, usageRecord.getUsageId().toString());
4573+
LoadBalancerVO lb = _entityMgr.findByIdIncludingRemoved(LoadBalancerVO.class, usageRecord.getUsageId());
45744574
resourceDetails.resourceType = ResourceObjectType.LoadBalancer;
45754575
if (lb != null) {
45764576
usageRecResponse.setUsageId(lb.getUuid());
@@ -4590,7 +4590,7 @@ private UsageResourceDetails populateLoadBalancerPolicyUsageResponse(Usage usage
45904590
private UsageResourceDetails populatePortForwardingRuleUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
45914591
UsageResourceDetails resourceDetails = new UsageResourceDetails();
45924592
//Port Forwarding Rule ID
4593-
PortForwardingRuleVO pf = _entityMgr.findByIdIncludingRemoved(PortForwardingRuleVO.class, usageRecord.getUsageId().toString());
4593+
PortForwardingRuleVO pf = _entityMgr.findByIdIncludingRemoved(PortForwardingRuleVO.class, usageRecord.getUsageId());
45944594
resourceDetails.resourceType = ResourceObjectType.PortForwardingRule;
45954595
if (pf != null) {
45964596
usageRecResponse.setUsageId(pf.getUuid());
@@ -4609,7 +4609,7 @@ private UsageResourceDetails populatePortForwardingRuleUsageResponse(Usage usage
46094609

46104610
private UsageResourceDetails populateNetworkOfferingUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
46114611
//Network Offering Id
4612-
NetworkOfferingVO netOff = _entityMgr.findByIdIncludingRemoved(NetworkOfferingVO.class, usageRecord.getOfferingId().toString());
4612+
NetworkOfferingVO netOff = _entityMgr.findByIdIncludingRemoved(NetworkOfferingVO.class, usageRecord.getOfferingId());
46134613
if (netOff != null) {
46144614
usageRecResponse.setOfferingId(netOff.getUuid());
46154615
}
@@ -4631,7 +4631,7 @@ private UsageResourceDetails populateNetworkOfferingUsageResponse(Usage usageRec
46314631

46324632
private UsageResourceDetails populateVpnUsersUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
46334633
//VPN User ID
4634-
VpnUserVO vpnUser = _entityMgr.findByIdIncludingRemoved(VpnUserVO.class, usageRecord.getUsageId().toString());
4634+
VpnUserVO vpnUser = _entityMgr.findByIdIncludingRemoved(VpnUserVO.class, usageRecord.getUsageId());
46354635
if (vpnUser != null) {
46364636
usageRecResponse.setUsageId(vpnUser.getUuid());
46374637
}
@@ -4649,7 +4649,7 @@ private UsageResourceDetails populateVpnUsersUsageResponse(Usage usageRecord, Us
46494649
private UsageResourceDetails populateSecurityGroupUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
46504650
UsageResourceDetails resourceDetails = new UsageResourceDetails();
46514651
//Security Group Id
4652-
SecurityGroupVO sg = _entityMgr.findByIdIncludingRemoved(SecurityGroupVO.class, usageRecord.getUsageId().toString());
4652+
SecurityGroupVO sg = _entityMgr.findByIdIncludingRemoved(SecurityGroupVO.class, usageRecord.getUsageId());
46534653
resourceDetails.resourceType = ResourceObjectType.SecurityGroup;
46544654
if (sg != null) {
46554655
resourceDetails.resourceId = sg.getId();
@@ -4716,12 +4716,12 @@ private UsageResourceDetails populateVmSnapshotUsageResponse(Usage usageRecord,
47164716
usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
47174717
}
47184718
if (usageRecord.getOfferingId() != null) {
4719-
usageRecResponse.setOfferingId(usageRecord.getOfferingId().toString());
4719+
usageRecResponse.setOfferingId(usageRecord.getOfferingId());
47204720
}
47214721
if (!oldFormat) {
47224722
VolumeVO volume = null;
47234723
if (vmSnapshotVO == null && usageRecord.getUsageId() != null) {
4724-
volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
4724+
volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
47254725
}
47264726

47274727
DiskOfferingVO diskOff = null;
@@ -4751,7 +4751,7 @@ private UsageResourceDetails populateVmSnapshotUsageResponse(Usage usageRecord,
47514751
}
47524752

47534753
private UsageResourceDetails populateVolumeSecondaryUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
4754-
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
4754+
VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
47554755
if (!oldFormat) {
47564756
final StringBuilder builder = new StringBuilder();
47574757
builder.append("Volume on secondary storage usage");
@@ -4797,7 +4797,7 @@ private UsageResourceDetails populateVmSnapshotOnPrimaryUsageResponse(Usage usag
47974797
}
47984798

47994799
private UsageResourceDetails populateBucketUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse) {
4800-
BucketVO bucket = _entityMgr.findByIdIncludingRemoved(BucketVO.class, usageRecord.getUsageId().toString());
4800+
BucketVO bucket = _entityMgr.findByIdIncludingRemoved(BucketVO.class, usageRecord.getUsageId());
48014801
if (bucket != null) {
48024802
usageRecResponse.setUsageId(bucket.getUuid());
48034803
usageRecResponse.setResourceName(bucket.getName());

0 commit comments

Comments
 (0)