diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java index b7f7d0b41ee..02d5c44a93a 100644 --- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java @@ -16,18 +16,16 @@ // under the License. package org.apache.cloudstack.api.response; -import java.util.Date; -import java.util.Map; - +import com.cloud.serializer.Param; +import com.cloud.storage.StoragePool; +import com.cloud.storage.StoragePoolStatus; import com.google.gson.annotations.SerializedName; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import com.cloud.serializer.Param; -import com.cloud.storage.StoragePool; -import com.cloud.storage.StoragePoolStatus; +import java.util.Date; +import java.util.Map; @EntityReference(value = StoragePool.class) public class StoragePoolResponse extends BaseResponse { @@ -119,6 +117,10 @@ public class StoragePoolResponse extends BaseResponse { @Param(description = "true if this pool is suitable to migrate a volume," + " false otherwise") private Boolean suitableForMigration; + @SerializedName("provider") + @Param(description = "Storage provider for this pool") + private String provider; + @SerializedName(ApiConstants.STORAGE_CAPABILITIES) @Param(description = "the storage pool capabilities") private Map caps; @@ -317,4 +319,12 @@ public class StoragePoolResponse extends BaseResponse { public Boolean getSuitableForMigration() { return suitableForMigration; } + + public String getProvider() { + return provider; + } + + public void setProvider(String provider) { + this.provider = provider; + } } diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java index f51f52e2f8d..37fdaefefcf 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java @@ -16,16 +16,6 @@ // under the License. package com.cloud.api.query.dao; -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import org.apache.cloudstack.api.response.StoragePoolResponse; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; - import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.capacity.CapacityManager; @@ -35,6 +25,14 @@ import com.cloud.utils.StringUtils; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; @Component public class StoragePoolJoinDaoImpl extends GenericDaoBase implements StoragePoolJoinDao { @@ -98,6 +96,7 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase