Added the listHostTags API command
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59ea2e29 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59ea2e29 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59ea2e29 Branch: refs/heads/saml2 Commit: 59ea2e2960b3447344365d2dfce745e0a7ba7816 Parents: fd6d083 Author: seif <seifje...@gmail.com> Authored: Fri Aug 15 17:16:58 2014 +0200 Committer: Mike Tutkowski <mike.tutkow...@solidfire.com> Committed: Sun Aug 17 20:38:46 2014 -0600 ---------------------------------------------------------------------- .../api/command/admin/host/ListHostTagsCmd.java | 64 ++++++++++ .../api/response/HostTagResponse.java | 60 +++++++++ .../apache/cloudstack/query/QueryService.java | 3 + client/tomcatconf/commands.properties.in | 1 + .../spring-engine-schema-core-daos-context.xml | 1 + server/src/com/cloud/api/ApiDBUtils.java | 11 ++ .../com/cloud/api/query/QueryManagerImpl.java | 48 +++++++ .../com/cloud/api/query/ViewResponseHelper.java | 13 +- .../src/com/cloud/api/query/dao/HostTagDao.java | 30 +++++ .../com/cloud/api/query/dao/HostTagDaoImpl.java | 126 +++++++++++++++++++ .../src/com/cloud/api/query/vo/HostTagVO.java | 61 +++++++++ .../com/cloud/server/ManagementServerImpl.java | 3 +- 12 files changed, 419 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java new file mode 100644 index 0000000..5f55ada --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.api.command.admin.host; + +import org.apache.log4j.Logger; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiCommandJobType; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.HostTagResponse; + +@APICommand(name = "listHostTags", description = "Lists host tags", responseObject = HostTagResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +public class ListHostTagsCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(ListHostTagsCmd.class.getName()); + + private static final String s_name = "listhosttagsresponse"; + + // /////////////////////////////////////////////////// + // ////////////// API parameters ///////////////////// + // /////////////////////////////////////////////////// + + // /////////////////////////////////////////////////// + // ///////////////// Accessors /////////////////////// + // /////////////////////////////////////////////////// + + // /////////////////////////////////////////////////// + // ///////////// API Implementation/////////////////// + // /////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public ApiCommandJobType getInstanceType() { + return ApiCommandJobType.Host; + } + + @Override + public void execute() { + ListResponse<HostTagResponse> response = _queryService.searchForHostTags(this); + + response.setResponseName(getCommandName()); + + setResponseObject(response); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/api/src/org/apache/cloudstack/api/response/HostTagResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/HostTagResponse.java b/api/src/org/apache/cloudstack/api/response/HostTagResponse.java new file mode 100644 index 0000000..91b01af --- /dev/null +++ b/api/src/org/apache/cloudstack/api/response/HostTagResponse.java @@ -0,0 +1,60 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.response; + +import com.google.gson.annotations.SerializedName; +import com.cloud.serializer.Param; + +import org.apache.cloudstack.api.BaseResponse; + +public class HostTagResponse extends BaseResponse { + @SerializedName("id") + @Param(description = "the ID of the host tag") + private String id; + + @SerializedName("hostid") + @Param(description = "the host ID of the host tag") + private long hostId; + + @SerializedName("name") + @Param(description = "the name of the host tag") + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public long getHostId() { + return hostId; + } + + public void setHostId(long hostId) { + this.hostId = hostId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/api/src/org/apache/cloudstack/query/QueryService.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java index b45b7c3..0013be8 100644 --- a/api/src/org/apache/cloudstack/query/QueryService.java +++ b/api/src/org/apache/cloudstack/query/QueryService.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; +import org.apache.cloudstack.api.command.admin.host.ListHostTagsCmd; import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd; import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd; @@ -50,6 +51,7 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostTagResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ListResponse; @@ -128,5 +130,6 @@ public interface QueryService { ListResponse<DomainRouterResponse> searchForInternalLbVms(ListInternalLBVMsCmd cmd); public ListResponse<StorageTagResponse> searchForStorageTags(ListStorageTagsCmd cmd); + public ListResponse<HostTagResponse> searchForHostTags(ListHostTagsCmd cmd); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index e3e892b..3191bbf 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -299,6 +299,7 @@ deleteHost=3 prepareHostForMaintenance=1 cancelHostMaintenance=1 listHosts=3 +listHostTags=7 findHostsForMigration=1 addSecondaryStorage=1 updateHostPassword=1 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml ---------------------------------------------------------------------- diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml index b21ff43..9dd5571 100644 --- a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml +++ b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml @@ -263,6 +263,7 @@ <bean id="storagePoolDetailsDaoImpl" class="com.cloud.storage.dao.StoragePoolDetailsDaoImpl" /> <bean id="storagePoolJoinDaoImpl" class="com.cloud.api.query.dao.StoragePoolJoinDaoImpl" /> <bean id="storageTagDaoImpl" class="com.cloud.api.query.dao.StorageTagDaoImpl" /> + <bean id="hostTagDaoImpl" class="com.cloud.api.query.dao.HostTagDaoImpl" /> <bean id="storagePoolWorkDaoImpl" class="com.cloud.storage.dao.StoragePoolWorkDaoImpl" /> <bean id="templatePrimaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.volume.db.TemplatePrimaryDataStoreDaoImpl" /> <bean id="uploadDaoImpl" class="com.cloud.storage.dao.UploadDaoImpl" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/ApiDBUtils.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 8809778..37abdcb 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -41,6 +41,7 @@ import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostTagResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; @@ -74,6 +75,7 @@ import com.cloud.api.query.dao.DataCenterJoinDao; import com.cloud.api.query.dao.DiskOfferingJoinDao; import com.cloud.api.query.dao.DomainRouterJoinDao; import com.cloud.api.query.dao.HostJoinDao; +import com.cloud.api.query.dao.HostTagDao; import com.cloud.api.query.dao.ImageStoreJoinDao; import com.cloud.api.query.dao.InstanceGroupJoinDao; import com.cloud.api.query.dao.ProjectAccountJoinDao; @@ -96,6 +98,7 @@ import com.cloud.api.query.vo.DiskOfferingJoinVO; import com.cloud.api.query.vo.DomainRouterJoinVO; import com.cloud.api.query.vo.EventJoinVO; import com.cloud.api.query.vo.HostJoinVO; +import com.cloud.api.query.vo.HostTagVO; import com.cloud.api.query.vo.ImageStoreJoinVO; import com.cloud.api.query.vo.InstanceGroupJoinVO; import com.cloud.api.query.vo.ProjectAccountJoinVO; @@ -390,6 +393,7 @@ public class ApiDBUtils { static VolumeJoinDao s_volJoinDao; static StoragePoolJoinDao s_poolJoinDao; static StorageTagDao s_tagDao; + static HostTagDao s_hostTagDao; static ImageStoreJoinDao s_imageStoreJoinDao; static AccountJoinDao s_accountJoinDao; static AsyncJobJoinDao s_jobJoinDao; @@ -587,6 +591,8 @@ public class ApiDBUtils { @Inject private StorageTagDao tagDao; @Inject + private HostTagDao hosttagDao; + @Inject private ImageStoreJoinDao imageStoreJoinDao; @Inject private AccountJoinDao accountJoinDao; @@ -725,6 +731,7 @@ public class ApiDBUtils { s_volJoinDao = volJoinDao; s_poolJoinDao = poolJoinDao; s_tagDao = tagDao; + s_hostTagDao = hosttagDao; s_imageStoreJoinDao = imageStoreJoinDao; s_accountJoinDao = accountJoinDao; s_jobJoinDao = jobJoinDao; @@ -1744,6 +1751,10 @@ public class ApiDBUtils { return s_tagDao.newStorageTagResponse(vr); } + public static HostTagResponse newHostTagResponse(HostTagVO vr) { + return s_hostTagDao.newHostTagResponse(vr); + } + public static StoragePoolResponse fillStoragePoolDetails(StoragePoolResponse vrData, StoragePoolJoinVO vr) { return s_poolJoinDao.setStoragePoolResponse(vrData, vr); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 0b4eb6c..77338f3 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -36,6 +36,7 @@ import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.ResourceDetail; import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.admin.account.ListAccountsCmdByAdmin; +import org.apache.cloudstack.api.command.admin.host.ListHostTagsCmd; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd; import org.apache.cloudstack.api.command.admin.iso.ListIsosCmdByAdmin; @@ -72,6 +73,7 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostTagResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ListResponse; @@ -107,6 +109,7 @@ import com.cloud.api.query.dao.DataCenterJoinDao; import com.cloud.api.query.dao.DiskOfferingJoinDao; import com.cloud.api.query.dao.DomainRouterJoinDao; import com.cloud.api.query.dao.HostJoinDao; +import com.cloud.api.query.dao.HostTagDao; import com.cloud.api.query.dao.ImageStoreJoinDao; import com.cloud.api.query.dao.InstanceGroupJoinDao; import com.cloud.api.query.dao.ProjectAccountJoinDao; @@ -129,6 +132,7 @@ import com.cloud.api.query.vo.DiskOfferingJoinVO; import com.cloud.api.query.vo.DomainRouterJoinVO; import com.cloud.api.query.vo.EventJoinVO; import com.cloud.api.query.vo.HostJoinVO; +import com.cloud.api.query.vo.HostTagVO; import com.cloud.api.query.vo.ImageStoreJoinVO; import com.cloud.api.query.vo.InstanceGroupJoinVO; import com.cloud.api.query.vo.ProjectAccountJoinVO; @@ -291,6 +295,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { private StorageTagDao _storageTagDao; @Inject + private HostTagDao _hostTagDao; + + @Inject private ImageStoreJoinDao _imageStoreJoinDao; @Inject @@ -2184,6 +2191,47 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } @Override + public ListResponse<HostTagResponse> searchForHostTags(ListHostTagsCmd cmd) { + Pair<List<HostTagVO>, Integer> result = searchForHostTagsInternal(cmd); + ListResponse<HostTagResponse> response = new ListResponse<HostTagResponse>(); + List<HostTagResponse> tagResponses = ViewResponseHelper.createHostTagResponse(result.first().toArray(new HostTagVO[result.first().size()])); + + response.setResponses(tagResponses, result.second()); + + return response; + } + + private Pair<List<HostTagVO>, Integer> searchForHostTagsInternal(ListHostTagsCmd cmd) { + Filter searchFilter = new Filter(HostTagVO.class, "id", Boolean.TRUE, null, null); + + SearchBuilder<HostTagVO> sb = _hostTagDao.createSearchBuilder(); + + sb.select(null, Func.DISTINCT, sb.entity().getId()); // select distinct + + SearchCriteria<HostTagVO> sc = sb.create(); + + // search host tag details by ids + Pair<List<HostTagVO>, Integer> uniqueTagPair = _hostTagDao.searchAndCount(sc, searchFilter); + Integer count = uniqueTagPair.second(); + + if (count.intValue() == 0) { + return uniqueTagPair; + } + + List<HostTagVO> uniqueTags = uniqueTagPair.first(); + Long[] vrIds = new Long[uniqueTags.size()]; + int i = 0; + + for (HostTagVO v : uniqueTags) { + vrIds[i++] = v.getId(); + } + + List<HostTagVO> vrs = _hostTagDao.searchByIds(vrIds); + + return new Pair<List<HostTagVO>, Integer>(vrs, count); + } + + @Override public ListResponse<ImageStoreResponse> searchForImageStores(ListImageStoresCmd cmd) { Pair<List<ImageStoreJoinVO>, Integer> result = searchForImageStoresInternal(cmd); ListResponse<ImageStoreResponse> response = new ListResponse<ImageStoreResponse>(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/query/ViewResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java index f31a308..bec0048 100644 --- a/server/src/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/com/cloud/api/query/ViewResponseHelper.java @@ -23,7 +23,6 @@ import java.util.LinkedHashMap; import java.util.List; import org.apache.log4j.Logger; - import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; @@ -35,6 +34,7 @@ import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostTagResponse; import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; @@ -61,6 +61,7 @@ import com.cloud.api.query.vo.DiskOfferingJoinVO; import com.cloud.api.query.vo.DomainRouterJoinVO; import com.cloud.api.query.vo.EventJoinVO; import com.cloud.api.query.vo.HostJoinVO; +import com.cloud.api.query.vo.HostTagVO; import com.cloud.api.query.vo.ImageStoreJoinVO; import com.cloud.api.query.vo.InstanceGroupJoinVO; import com.cloud.api.query.vo.ProjectAccountJoinVO; @@ -301,6 +302,16 @@ public class ViewResponseHelper { return list; } + public static List<HostTagResponse> createHostTagResponse(HostTagVO... hostTags) { + ArrayList<HostTagResponse> list = new ArrayList<HostTagResponse>(); + + for (HostTagVO vr : hostTags) { + list.add(ApiDBUtils.newHostTagResponse(vr)); + } + + return list; + } + public static List<ImageStoreResponse> createImageStoreResponse(ImageStoreJoinVO... stores) { Hashtable<Long, ImageStoreResponse> vrDataList = new Hashtable<Long, ImageStoreResponse>(); // Initialise the vrdatalist with the input data http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/query/dao/HostTagDao.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostTagDao.java b/server/src/com/cloud/api/query/dao/HostTagDao.java new file mode 100644 index 0000000..f54ddfa --- /dev/null +++ b/server/src/com/cloud/api/query/dao/HostTagDao.java @@ -0,0 +1,30 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.dao; + +import java.util.List; + +import org.apache.cloudstack.api.response.HostTagResponse; + +import com.cloud.api.query.vo.HostTagVO; +import com.cloud.utils.db.GenericDao; + +public interface HostTagDao extends GenericDao<HostTagVO, Long> { + HostTagResponse newHostTagResponse(HostTagVO hostTag); + + List<HostTagVO> searchByIds(Long... hostTagIds); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java b/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java new file mode 100644 index 0000000..d73deb5 --- /dev/null +++ b/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java @@ -0,0 +1,126 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.dao; + +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.api.response.HostTagResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.cloud.api.query.vo.HostTagVO; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; + +@Component +@Local(value = {HostTagDao.class}) +public class HostTagDaoImpl extends GenericDaoBase<HostTagVO, Long> implements HostTagDao { + public static final Logger s_logger = Logger.getLogger(HostTagDaoImpl.class); + + @Inject + private ConfigurationDao _configDao; + + private final SearchBuilder<HostTagVO> stSearch; + private final SearchBuilder<HostTagVO> stIdSearch; + + protected HostTagDaoImpl() { + stSearch = createSearchBuilder(); + + stSearch.and("idIN", stSearch.entity().getId(), SearchCriteria.Op.IN); + stSearch.done(); + + stIdSearch = createSearchBuilder(); + + stIdSearch.and("id", stIdSearch.entity().getId(), SearchCriteria.Op.EQ); + stIdSearch.done(); + + _count = "select count(distinct id) from host_tags WHERE "; + } + + @Override + public HostTagResponse newHostTagResponse(HostTagVO tag) { + HostTagResponse tagResponse = new HostTagResponse(); + + tagResponse.setName(tag.getName()); + tagResponse.setHostId(tag.getHostId()); + + tagResponse.setObjectName("hosttag"); + + return tagResponse; + } + + @Override + public List<HostTagVO> searchByIds(Long... stIds) { + String batchCfg = _configDao.getValue("detail.batch.query.size"); + + final int detailsBatchSize = batchCfg != null ? Integer.parseInt(batchCfg) : 2000; + + // query details by batches + List<HostTagVO> uvList = new ArrayList<HostTagVO>(); + int curr_index = 0; + + if (stIds.length > detailsBatchSize) { + while ((curr_index + detailsBatchSize) <= stIds.length) { + Long[] ids = new Long[detailsBatchSize]; + + for (int k = 0, j = curr_index; j < curr_index + detailsBatchSize; j++, k++) { + ids[k] = stIds[j]; + } + + SearchCriteria<HostTagVO> sc = stSearch.create(); + + sc.setParameters("idIN", (Object[])ids); + + List<HostTagVO> vms = searchIncludingRemoved(sc, null, null, false); + + if (vms != null) { + uvList.addAll(vms); + } + + curr_index += detailsBatchSize; + } + } + + if (curr_index < stIds.length) { + int batch_size = (stIds.length - curr_index); + // set the ids value + Long[] ids = new Long[batch_size]; + + for (int k = 0, j = curr_index; j < curr_index + batch_size; j++, k++) { + ids[k] = stIds[j]; + } + + SearchCriteria<HostTagVO> sc = stSearch.create(); + + sc.setParameters("idIN", (Object[])ids); + + List<HostTagVO> vms = searchIncludingRemoved(sc, null, null, false); + + if (vms != null) { + uvList.addAll(vms); + } + } + + return uvList; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/api/query/vo/HostTagVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/HostTagVO.java b/server/src/com/cloud/api/query/vo/HostTagVO.java new file mode 100644 index 0000000..60db16a --- /dev/null +++ b/server/src/com/cloud/api/query/vo/HostTagVO.java @@ -0,0 +1,61 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.vo; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.cloudstack.api.InternalIdentity; + +/** + * Storage Tags DB view. + * + */ +@Entity +@Table(name = "host_tags") +public class HostTagVO extends BaseViewVO implements InternalIdentity { + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "id") + private long id; + + @Column(name = "tag") + private String name; + + @Column(name = "host_id") + long hostId; + + @Override + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public long getHostId() { + return hostId; + } + + public void setHostId(long hostId) { + this.hostId = hostId; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59ea2e29/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 280009b..c320089 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -40,7 +40,6 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; - import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.affinity.AffinityGroupProcessor; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; @@ -84,6 +83,7 @@ import org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd; import org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd; import org.apache.cloudstack.api.command.admin.host.DeleteHostCmd; import org.apache.cloudstack.api.command.admin.host.FindHostsForMigrationCmd; +import org.apache.cloudstack.api.command.admin.host.ListHostTagsCmd; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd; import org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd; @@ -2564,6 +2564,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(CancelMaintenanceCmd.class); cmdList.add(DeleteHostCmd.class); cmdList.add(ListHostsCmd.class); + cmdList.add(ListHostTagsCmd.class); cmdList.add(FindHostsForMigrationCmd.class); cmdList.add(PrepareForMaintenanceCmd.class); cmdList.add(ReconnectHostCmd.class);
