@@ -151,7 +151,7 @@ private void addHostMetrics(final List<Item> metricsList, final long dcId, final
151151 accountName = (account != null ) ? account .getAccountName () : "" ;
152152
153153 DomainJoinVO domain = domainDao .findById (dr .getDomainId ());
154- metricsList .add (new ItemHostDedicatedToAccount (zoneName , host .getName (), accountName , domain .getName (), isDedicated ));
154+ metricsList .add (new ItemHostDedicatedToAccount (zoneName , host .getName (), accountName , domain .getPath (), isDedicated ));
155155 }
156156
157157 final String cpuFactor = String .valueOf (CapacityManager .CpuOverprovisioningFactor .valueIn (host .getClusterId ()));
@@ -368,10 +368,10 @@ private void addDomainLimits(final List<Item> metricsList) {
368368 Resource .ResourceType .secondary_storage , domain .getId ());
369369
370370 // Add per domain cpu, memory and storage count
371- metricsList .add (new ItemPerDomainResourceLimit (cpuLimit , domain .getName (), Resource .ResourceType .cpu .getName ()));
372- metricsList .add (new ItemPerDomainResourceLimit (memoryLimit , domain .getName (), Resource .ResourceType .memory .getName ()));
373- metricsList .add (new ItemPerDomainResourceLimit (primaryStorageLimit , domain .getName (), Resource .ResourceType .primary_storage .getName ()));
374- metricsList .add (new ItemPerDomainResourceLimit (secondaryStorageLimit , domain .getName (), Resource .ResourceType .secondary_storage .getName ()));
371+ metricsList .add (new ItemPerDomainResourceLimit (cpuLimit , domain .getPath (), Resource .ResourceType .cpu .getName ()));
372+ metricsList .add (new ItemPerDomainResourceLimit (memoryLimit , domain .getPath (), Resource .ResourceType .memory .getName ()));
373+ metricsList .add (new ItemPerDomainResourceLimit (primaryStorageLimit , domain .getPath (), Resource .ResourceType .primary_storage .getName ()));
374+ metricsList .add (new ItemPerDomainResourceLimit (secondaryStorageLimit , domain .getPath (), Resource .ResourceType .secondary_storage .getName ()));
375375 }
376376 metricsList .add (new ItemDomainLimitCpu (totalCpuLimit ));
377377 metricsList .add (new ItemDomainLimitMemory (totalMemoryLimit ));
@@ -398,11 +398,11 @@ private void addDomainResourceCount(final List<Item> metricsList) {
398398 long secondaryStorageUsed = _resourceCountDao .getResourceCount (domain .getId (), Resource .ResourceOwnerType .Domain ,
399399 Resource .ResourceType .secondary_storage );
400400
401- metricsList .add (new ItemPerDomainResourceCount (memoryUsed , domain .getName (), Resource .ResourceType .memory .getName ()));
402- metricsList .add (new ItemPerDomainResourceCount (cpuUsed , domain .getName (), Resource .ResourceType .cpu .getName ()));
403- metricsList .add (new ItemPerDomainResourceCount (primaryStorageUsed , domain .getName (),
401+ metricsList .add (new ItemPerDomainResourceCount (memoryUsed , domain .getPath (), Resource .ResourceType .memory .getName ()));
402+ metricsList .add (new ItemPerDomainResourceCount (cpuUsed , domain .getPath (), Resource .ResourceType .cpu .getName ()));
403+ metricsList .add (new ItemPerDomainResourceCount (primaryStorageUsed , domain .getPath (),
404404 Resource .ResourceType .primary_storage .getName ()));
405- metricsList .add (new ItemPerDomainResourceCount (secondaryStorageUsed , domain .getName (),
405+ metricsList .add (new ItemPerDomainResourceCount (secondaryStorageUsed , domain .getPath (),
406406 Resource .ResourceType .secondary_storage .getName ()));
407407 }
408408 }
0 commit comments