153153import com .cloud .api .query .vo .UserVmJoinVO ;
154154import com .cloud .api .query .vo .VolumeJoinVO ;
155155import com .cloud .dc .DedicatedResourceVO ;
156- import com .cloud .dc .dao .DataCenterDetailsDao ;
157156import com .cloud .dc .dao .DedicatedResourceDao ;
158157import com .cloud .domain .Domain ;
159158import com .cloud .domain .DomainVO ;
205204import com .cloud .utils .Pair ;
206205import com .cloud .utils .StringUtils ;
207206import com .cloud .utils .Ternary ;
207+ import com .cloud .utils .db .EntityManager ;
208208import com .cloud .utils .db .Filter ;
209209import com .cloud .utils .db .JoinBuilder ;
210210import com .cloud .utils .db .SearchBuilder ;
@@ -330,7 +330,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
330330 private DomainRouterDao _routerDao ;
331331
332332 @ Inject
333- UserVmDetailsDao _userVmDetailDao ;
333+ private UserVmDetailsDao _userVmDetailDao ;
334334
335335 @ Inject
336336 private HighAvailabilityManager _haMgr ;
@@ -342,15 +342,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
342342 private TemplateJoinDao _templateJoinDao ;
343343
344344 @ Inject
345- ResourceManager _resourceMgr ;
345+ private ResourceManager _resourceMgr ;
346346 @ Inject
347347 private ResourceMetaDataService _resourceMetaDataMgr ;
348348
349349 @ Inject
350350 private TaggedResourceService _taggedResourceMgr ;
351351
352352 @ Inject
353- AffinityGroupVMMapDao _affinityGroupVMMapDao ;
353+ private AffinityGroupVMMapDao _affinityGroupVMMapDao ;
354354
355355 @ Inject
356356 private AffinityGroupJoinDao _affinityGroupJoinDao ;
@@ -359,22 +359,22 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
359359 private DedicatedResourceDao _dedicatedDao ;
360360
361361 @ Inject
362- DataCenterDetailsDao _dcDetailsDao ;
362+ private DomainManager _domainMgr ;
363363
364364 @ Inject
365- DomainManager _domainMgr ;
365+ private AffinityGroupDomainMapDao _affinityGroupDomainMapDao ;
366366
367367 @ Inject
368- AffinityGroupDomainMapDao _affinityGroupDomainMapDao ;
368+ private NetworkDetailsDao _networkDetailsDao ;
369369
370370 @ Inject
371- NetworkDetailsDao _networkDetailsDao ;
371+ private ResourceTagDao _resourceTagDao ;
372372
373373 @ Inject
374- ResourceTagDao _resourceTagDao ;
374+ private DataStoreManager dataStoreManager ;
375375
376376 @ Inject
377- DataStoreManager dataStoreManager ;
377+ private EntityManager _entityMgr ;
378378
379379 /*
380380 * (non-Javadoc)
@@ -3674,7 +3674,7 @@ public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd c
36743674
36753675 protected ResourceDetailResponse createResourceDetailsResponse (ResourceDetail requestedDetail , ResourceTag .ResourceObjectType resourceType ) {
36763676 ResourceDetailResponse resourceDetailResponse = new ResourceDetailResponse ();
3677- resourceDetailResponse .setResourceId (String .valueOf (requestedDetail .getResourceId ()));
3677+ resourceDetailResponse .setResourceId (_taggedResourceMgr . getUuid ( String .valueOf (requestedDetail .getResourceId ()), resourceType ));
36783678 resourceDetailResponse .setName (requestedDetail .getName ());
36793679 resourceDetailResponse .setValue (requestedDetail .getValue ());
36803680 resourceDetailResponse .setForDisplay (requestedDetail .isDisplay ());
0 commit comments