You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/06/05 10:33:46 UTC
git commit: updated refs/heads/master to 4da9952
Updated Branches:
refs/heads/master f321acd06 -> 4da995238
CLOUDSTACK-2783: FIXED listHypervisorCapabilities API response to include the following fields: 1. maxdatavolumes 2. maxhostspercluster 3. storagemotionenabled
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4da99523
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4da99523
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4da99523
Branch: refs/heads/master
Commit: 4da995238b0f4b9d4109afaa505e9213e07486f5
Parents: f321acd
Author: SrikanteswaraRao Talluri <sr...@citrix.com>
Authored: Fri May 31 14:27:54 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Wed Jun 5 13:50:41 2013 +0530
----------------------------------------------------------------------
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../response/HypervisorCapabilitiesResponse.java | 32 +++++++++++++++
server/src/com/cloud/api/ApiResponseHelper.java | 3 +
3 files changed, 38 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4da99523/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 1e9435f..a0cd0f5 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -206,6 +206,7 @@ public class ApiConstants {
public static final String STATE = "state";
public static final String STATUS = "status";
public static final String STORAGE_TYPE = "storagetype";
+ public static final String STORAGE_MOTION_ENABLED = "storagemotionenabled";
public static final String SYSTEM_VM_TYPE = "systemvmtype";
public static final String TAGS = "tags";
public static final String TARGET_IQN = "targetiqn";
@@ -304,6 +305,8 @@ public class ApiConstants {
public static final String TEMPLATE_TAG = "templatetag";
public static final String HYPERVISOR_VERSION = "hypervisorversion";
public static final String MAX_GUESTS_LIMIT = "maxguestslimit";
+ public static final String MAX_DATA_VOLUMES_LIMIT = "maxdatavolumeslimit";
+ public static final String MAX_HOSTS_PER_CLUSTER = "maxhostspercluster";
public static final String PROJECT_ID = "projectid";
public static final String PROJECT_IDS = "projectids";
public static final String PROJECT = "project";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4da99523/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
index 3602187..2d37add 100644
--- a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
@@ -42,6 +42,14 @@ public class HypervisorCapabilitiesResponse extends BaseResponse {
@SerializedName(ApiConstants.SECURITY_GROUP_EANBLED) @Param(description="true if security group is supported")
private boolean isSecurityGroupEnabled;
+ @SerializedName(ApiConstants.MAX_DATA_VOLUMES_LIMIT) @Param(description="the maximum number of Data Volumes that can be attached for this hypervisor")
+ private Integer maxDataVolumesLimit;
+
+ @SerializedName(ApiConstants.MAX_HOSTS_PER_CLUSTER) @Param(description="the maximum number of Hosts per cluster for this hypervisor")
+ private Integer maxHostsPerCluster;
+
+ @SerializedName(ApiConstants.STORAGE_MOTION_ENABLED) @Param(description="true if storage motion is supported")
+ private boolean isStorageMotionSupported;
public String getId() {
return id;
@@ -83,4 +91,28 @@ public class HypervisorCapabilitiesResponse extends BaseResponse {
public void setIsSecurityGroupEnabled(Boolean sgEnabled) {
this.isSecurityGroupEnabled = sgEnabled;
}
+
+ public Boolean getIsStorageMotionSupported() {
+ return this.isStorageMotionSupported;
+ }
+
+ public void setIsStorageMotionSupported(Boolean smSupported) {
+ this.isStorageMotionSupported = smSupported;
+ }
+
+ public Integer getMaxDataVolumesLimit() {
+ return maxDataVolumesLimit;
+ }
+
+ public void setMaxDataVolumesLimit(Integer maxDataVolumesLimit) {
+ this.maxDataVolumesLimit = maxDataVolumesLimit;
+ }
+
+ public Integer getMaxHostsPerCluster() {
+ return maxHostsPerCluster;
+ }
+
+ public void setMaxHostsPerCluster(Integer maxHostsPerCluster) {
+ this.maxHostsPerCluster = maxHostsPerCluster;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4da99523/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 55929cf..bcc1605 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2485,6 +2485,9 @@ public class ApiResponseHelper implements ResponseGenerator {
hpvCapabilitiesResponse.setHypervisorVersion(hpvCapabilities.getHypervisorVersion());
hpvCapabilitiesResponse.setIsSecurityGroupEnabled(hpvCapabilities.isSecurityGroupEnabled());
hpvCapabilitiesResponse.setMaxGuestsLimit(hpvCapabilities.getMaxGuestsLimit());
+ hpvCapabilitiesResponse.setMaxDataVolumesLimit(hpvCapabilities.getMaxDataVolumesLimit());
+ hpvCapabilitiesResponse.setMaxHostsPerCluster(hpvCapabilities.getMaxHostsPerCluster());
+ hpvCapabilitiesResponse.setIsStorageMotionSupported(hpvCapabilities.isStorageMotionSupported());
return hpvCapabilitiesResponse;
}