You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/04 11:02:56 UTC
[35/55] [abbrv] api_refactor: refactor project apis
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/commands/UploadVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/UploadVolumeCmd.java b/api/src/com/cloud/api/commands/UploadVolumeCmd.java
index b67c0c7..600dfa0 100755
--- a/api/src/com/cloud/api/commands/UploadVolumeCmd.java
+++ b/api/src/com/cloud/api/commands/UploadVolumeCmd.java
@@ -1,147 +1,147 @@
-// 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.commands;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.IdentityMapper;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.VolumeResponse;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.storage.Volume;
-import com.cloud.user.UserContext;
-
-@Implementation(description="Uploads a data disk.", responseObject=VolumeResponse.class)
-public class UploadVolumeCmd extends BaseAsyncCmd {
- public static final Logger s_logger = Logger.getLogger(UploadVolumeCmd.class.getName());
- private static final String s_name = "uploadvolumeresponse";
-
- /////////////////////////////////////////////////////
- //////////////// API parameters /////////////////////
- /////////////////////////////////////////////////////
-
- @Parameter(name=ApiConstants.FORMAT, type=CommandType.STRING, required=true, description="the format for the volume. Possible values include QCOW2, OVA, and VHD.")
- private String format;
-
- @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the name of the volume")
- private String volumeName;
-
- @Parameter(name=ApiConstants.URL, type=CommandType.STRING, required=true, description="the URL of where the volume is hosted. Possible URL include http:// and https://")
- private String url;
-
- @IdentityMapper(entityTableName="data_center")
- @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the ID of the zone the volume is to be hosted on")
- private Long zoneId;
-
- @IdentityMapper(entityTableName="domain")
- @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="an optional domainId. If the account parameter is used, domainId must also be used.")
- private Long domainId;
-
- @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="an optional accountName. Must be used with domainId.")
- private String accountName;
-
- @Parameter(name=ApiConstants.CHECKSUM, type=CommandType.STRING, description="the MD5 checksum value of this volume")
- private String checksum;
-
- /////////////////////////////////////////////////////
- /////////////////// Accessors ///////////////////////
- /////////////////////////////////////////////////////
-
- public String getFormat() {
- return format;
- }
-
- public String getVolumeName() {
- return volumeName;
- }
-
- public String getUrl() {
- return url;
- }
-
- public Long getZoneId() {
- return zoneId;
- }
-
- public Long getDomainId() {
- return domainId;
- }
-
- public String getAccountName() {
- return accountName;
- }
-
- public String getChecksum() {
- return checksum;
- }
-
- /////////////////////////////////////////////////////
- /////////////// API Implementation///////////////////
- /////////////////////////////////////////////////////
-
- @Override
- public void execute() throws ResourceUnavailableException,
- InsufficientCapacityException, ServerApiException,
- ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
-
- Volume volume = _storageService.uploadVolume(this);
- if (volume != null){
- VolumeResponse response = _responseGenerator.createVolumeResponse(volume);
- response.setResponseName(getCommandName());
- this.setResponseObject(response);
- } else {
- throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to upload volume");
- }
- }
-
- @Override
- public String getCommandName() {
- return s_name;
- }
-
- @Override
- public long getEntityOwnerId() {
- Long accountId = finalyzeAccountId(accountName, domainId, null, true);
- if (accountId == null) {
- return UserContext.current().getCaller().getId();
- }
-
- return accountId;
- }
-
- @Override
- public String getEventDescription() {
- return "uploading volume: " + getVolumeName() + " in the zone " + getZoneId();
- }
-
- @Override
- public String getEventType() {
- return EventTypes.EVENT_VOLUME_UPLOAD;
- }
-
-}
+// 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.commands;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.IdentityMapper;
+import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import com.cloud.api.response.VolumeResponse;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.storage.Volume;
+import com.cloud.user.UserContext;
+
+@Implementation(description="Uploads a data disk.", responseObject=VolumeResponse.class)
+public class UploadVolumeCmd extends BaseAsyncCmd {
+ public static final Logger s_logger = Logger.getLogger(UploadVolumeCmd.class.getName());
+ private static final String s_name = "uploadvolumeresponse";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name=ApiConstants.FORMAT, type=CommandType.STRING, required=true, description="the format for the volume. Possible values include QCOW2, OVA, and VHD.")
+ private String format;
+
+ @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the name of the volume")
+ private String volumeName;
+
+ @Parameter(name=ApiConstants.URL, type=CommandType.STRING, required=true, description="the URL of where the volume is hosted. Possible URL include http:// and https://")
+ private String url;
+
+ @IdentityMapper(entityTableName="data_center")
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the ID of the zone the volume is to be hosted on")
+ private Long zoneId;
+
+ @IdentityMapper(entityTableName="domain")
+ @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="an optional domainId. If the account parameter is used, domainId must also be used.")
+ private Long domainId;
+
+ @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="an optional accountName. Must be used with domainId.")
+ private String accountName;
+
+ @Parameter(name=ApiConstants.CHECKSUM, type=CommandType.STRING, description="the MD5 checksum value of this volume")
+ private String checksum;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public String getFormat() {
+ return format;
+ }
+
+ public String getVolumeName() {
+ return volumeName;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public Long getDomainId() {
+ return domainId;
+ }
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public String getChecksum() {
+ return checksum;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException,
+ InsufficientCapacityException, ServerApiException,
+ ConcurrentOperationException, ResourceAllocationException,
+ NetworkRuleConflictException {
+
+ Volume volume = _storageService.uploadVolume(this);
+ if (volume != null){
+ VolumeResponse response = _responseGenerator.createVolumeResponse(volume);
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
+ } else {
+ throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to upload volume");
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Long accountId = finalyzeAccountId(accountName, domainId, null, true);
+ if (accountId == null) {
+ return UserContext.current().getCaller().getId();
+ }
+
+ return accountId;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "uploading volume: " + getVolumeName() + " in the zone " + getZoneId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VOLUME_UPLOAD;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java b/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java
index fa7d99b..12d9709 100755
--- a/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java
+++ b/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java
@@ -39,70 +39,70 @@ import com.cloud.user.Account;
@Implementation(description="List a storage network IP range.", responseObject=StorageNetworkIpRangeResponse.class, since="3.0.0")
public class listStorageNetworkIpRangeCmd extends BaseListCmd {
- public static final Logger s_logger = Logger.getLogger(listStorageNetworkIpRangeCmd.class);
-
- String s_name = "liststoragenetworkiprangeresponse";
+ public static final Logger s_logger = Logger.getLogger(listStorageNetworkIpRangeCmd.class);
+
+ String s_name = "liststoragenetworkiprangeresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
- /////////////////////////////////////////////////////
-
+ /////////////////////////////////////////////////////
+
@IdentityMapper(entityTableName="dc_storage_network_ip_range")
@Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="optional parameter. Storaget network IP range uuid, if specicied, using it to search the range.")
private Long rangeId;
-
+
@IdentityMapper(entityTableName="host_pod_ref")
@Parameter(name=ApiConstants.POD_ID, type=CommandType.LONG, description="optional parameter. Pod uuid, if specicied and range uuid is absent, using it to search the range.")
private Long podId;
-
+
@IdentityMapper(entityTableName="data_center")
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="optional parameter. Zone uuid, if specicied and both pod uuid and range uuid are absent, using it to search the range.")
private Long zoneId;
-
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
-
+
public Long getRangeId() {
- return rangeId;
+ return rangeId;
}
-
+
public Long getPodId() {
- return podId;
+ return podId;
}
-
+
public Long getZoneId() {
- return zoneId;
+ return zoneId;
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
+ try {
+ List<StorageNetworkIpRange> results = _storageNetworkService.listIpRange(this);
+ ListResponse<StorageNetworkIpRangeResponse> response = new ListResponse<StorageNetworkIpRangeResponse>();
+ List<StorageNetworkIpRangeResponse> resList = new ArrayList<StorageNetworkIpRangeResponse>(results.size());
+ for (StorageNetworkIpRange r : results) {
+ StorageNetworkIpRangeResponse resp = _responseGenerator.createStorageNetworkIpRangeResponse(r);
+ resList.add(resp);
+ }
+ response.setResponses(resList);
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
+ } catch (Exception e) {
+ s_logger.warn("Failed to list storage network ip range for rangeId=" + getRangeId() + " podId=" + getPodId() + " zoneId=" + getZoneId());
+ throw new ServerApiException(BaseCmd.INTERNAL_ERROR, e.getMessage());
+ }
}
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
- ResourceAllocationException {
- try {
- List<StorageNetworkIpRange> results = _storageNetworkService.listIpRange(this);
- ListResponse<StorageNetworkIpRangeResponse> response = new ListResponse<StorageNetworkIpRangeResponse>();
- List<StorageNetworkIpRangeResponse> resList = new ArrayList<StorageNetworkIpRangeResponse>(results.size());
- for (StorageNetworkIpRange r : results) {
- StorageNetworkIpRangeResponse resp = _responseGenerator.createStorageNetworkIpRangeResponse(r);
- resList.add(resp);
- }
- response.setResponses(resList);
- response.setResponseName(getCommandName());
- this.setResponseObject(response);
- } catch (Exception e) {
- s_logger.warn("Failed to list storage network ip range for rangeId=" + getRangeId() + " podId=" + getPodId() + " zoneId=" + getZoneId());
- throw new ServerApiException(BaseCmd.INTERNAL_ERROR, e.getMessage());
- }
- }
-
- @Override
- public String getCommandName() {
- return s_name;
- }
-
- @Override
- public long getEntityOwnerId() {
- return Account.ACCOUNT_ID_SYSTEM;
- }
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/AccountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/AccountResponse.java b/api/src/com/cloud/api/response/AccountResponse.java
index 5a3a928..169dba2 100755
--- a/api/src/com/cloud/api/response/AccountResponse.java
+++ b/api/src/com/cloud/api/response/AccountResponse.java
@@ -40,7 +40,7 @@ public class AccountResponse extends BaseResponse {
@SerializedName(ApiConstants.DOMAIN) @Param(description="name of the Domain the account belongs too")
private String domainName;
-
+
@SerializedName(ApiConstants.DEFAULT_ZONE_ID) @Param(description="the default zone of the account")
private IdentityProxy defaultZoneId = new IdentityProxy("data_center");
@@ -100,7 +100,7 @@ public class AccountResponse extends BaseResponse {
@SerializedName("vmrunning") @Param(description="the total number of virtual machines running for this account")
private Integer vmRunning;
-
+
@SerializedName("projectlimit") @Param(description="the total number of projects the account can own", since="3.0.1")
private String projectLimit;
@@ -109,7 +109,7 @@ public class AccountResponse extends BaseResponse {
@SerializedName("projectavailable") @Param(description="the total number of projects available for administration by this account", since="3.0.1")
private String projectAvailable;
-
+
@SerializedName("networklimit") @Param(description="the total number of networks the account can own", since="3.0.1")
private String networkLimit;
@@ -118,7 +118,7 @@ public class AccountResponse extends BaseResponse {
@SerializedName("networkavailable") @Param(description="the total number of networks available to be created for this account", since="3.0.1")
private String networkAvailable;
-
+
@SerializedName("vpclimit") @Param(description="the total number of vpcs the account can own", since="3.0.5")
private String vpcLimit;
@@ -127,20 +127,20 @@ public class AccountResponse extends BaseResponse {
@SerializedName("vpcavailable") @Param(description="the total number of vpcs available to be created for this account", since="3.0.5")
private String vpcAvailable;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="the state of the account")
private String state;
@SerializedName(ApiConstants.IS_CLEANUP_REQUIRED) @Param(description="true if the account requires cleanup")
private Boolean cleanupRequired;
-
+
@SerializedName("user") @Param(description="the list of users associated with account", responseObject = UserResponse.class)
private List<UserResponse> users;
-
+
@SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain")
private String networkDomain;
-
+
@SerializedName(ApiConstants.ACCOUNT_DETAILS) @Param(description="details for the account")
private Map<String, String> details;
@@ -247,7 +247,7 @@ public class AccountResponse extends BaseResponse {
public void setCleanupRequired(Boolean cleanupRequired) {
this.cleanupRequired = cleanupRequired;
}
-
+
public void setUsers(List<UserResponse> users) {
this.users = users;
}
@@ -255,9 +255,9 @@ public class AccountResponse extends BaseResponse {
public void setNetworkDomain(String networkDomain) {
this.networkDomain = networkDomain;
}
-
+
public void setDetails(Map<String, String> details) {
- this.details = details;
+ this.details = details;
}
public void setProjectLimit(String projectLimit) {
@@ -283,8 +283,8 @@ public class AccountResponse extends BaseResponse {
public void setNetworkAvailable(String networkAvailable) {
this.networkAvailable = networkAvailable;
}
-
+
public void setDefaultZone(Long defaultZoneId) {
- this.defaultZoneId.setValue(defaultZoneId);
+ this.defaultZoneId.setValue(defaultZoneId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/AsyncJobResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/AsyncJobResponse.java b/api/src/com/cloud/api/response/AsyncJobResponse.java
index ba76522..9dc4313 100644
--- a/api/src/com/cloud/api/response/AsyncJobResponse.java
+++ b/api/src/com/cloud/api/response/AsyncJobResponse.java
@@ -5,7 +5,7 @@
// 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,
@@ -51,14 +51,14 @@ public class AsyncJobResponse extends BaseResponse {
@SerializedName("jobresult") @Param(description="the result reason")
private ResponseObject jobResult;
-
+
@SerializedName("jobinstancetype") @Param(description="the instance/entity object related to the job")
private String jobInstanceType;
@SerializedName("jobinstanceid") @Param(description="the unique ID of the instance/entity object related to the job")
private IdentityProxy jobInstanceId = new IdentityProxy();
- @SerializedName(ApiConstants.CREATED) @Param(description=" the created date of the job")
+ @SerializedName(ApiConstants.CREATED) @Param(description=" the created date of the job")
private Date created;
public void setAccountId(Long accountId) {
@@ -98,33 +98,33 @@ public class AsyncJobResponse extends BaseResponse {
this.jobInstanceType = jobInstanceType;
if(jobInstanceType != null) {
- if(jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Volume.toString())) {
- this.jobInstanceId.setTableName("volumes");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Template.toString())) {
- this.jobInstanceId.setTableName("vm_template");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Iso.toString())) {
- this.jobInstanceId.setTableName("vm_template");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.VirtualMachine.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.ConsoleProxy.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.SystemVm.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.DomainRouter.toString()) ) {
- this.jobInstanceId.setTableName("vm_instance");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Snapshot.toString())) {
- this.jobInstanceId.setTableName("snapshots");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Host.toString())) {
- this.jobInstanceId.setTableName("host");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.StoragePool.toString())) {
- this.jobInstanceId.setTableName("storage_pool");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.IpAddress.toString())) {
- this.jobInstanceId.setTableName("user_ip_address");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.SecurityGroup.toString())) {
- this.jobInstanceId.setTableName("security_group");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.PhysicalNetwork.toString())) {
- this.jobInstanceId.setTableName("physical_network");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.TrafficType.toString())) {
+ if(jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Volume.toString())) {
+ this.jobInstanceId.setTableName("volumes");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Template.toString())) {
+ this.jobInstanceId.setTableName("vm_template");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Iso.toString())) {
+ this.jobInstanceId.setTableName("vm_template");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.VirtualMachine.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.ConsoleProxy.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.SystemVm.toString()) || jobInstanceType.equalsIgnoreCase(AsyncJob.Type.DomainRouter.toString()) ) {
+ this.jobInstanceId.setTableName("vm_instance");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Snapshot.toString())) {
+ this.jobInstanceId.setTableName("snapshots");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Host.toString())) {
+ this.jobInstanceId.setTableName("host");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.StoragePool.toString())) {
+ this.jobInstanceId.setTableName("storage_pool");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.IpAddress.toString())) {
+ this.jobInstanceId.setTableName("user_ip_address");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.SecurityGroup.toString())) {
+ this.jobInstanceId.setTableName("security_group");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.PhysicalNetwork.toString())) {
+ this.jobInstanceId.setTableName("physical_network");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.TrafficType.toString())) {
this.jobInstanceId.setTableName("physical_network_traffic_types");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.PhysicalNetworkServiceProvider.toString())) {
this.jobInstanceId.setTableName("physical_network_service_providers");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.FirewallRule.toString())) {
- this.jobInstanceId.setTableName("firewall_rules");
- } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Account.toString())) {
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.FirewallRule.toString())) {
+ this.jobInstanceId.setTableName("firewall_rules");
+ } else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.Account.toString())) {
this.jobInstanceId.setTableName("account");
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.User.toString())) {
this.jobInstanceId.setTableName("user");
@@ -143,14 +143,14 @@ public class AsyncJobResponse extends BaseResponse {
} else if (jobInstanceType.equalsIgnoreCase(AsyncJob.Type.AutoScaleVmGroup.toString())) {
this.jobInstanceId.setTableName("autoscale_vmgroups");
} else if (!jobInstanceType.equalsIgnoreCase(AsyncJob.Type.None.toString())){
- // TODO : when we hit here, we need to add instanceType -> UUID entity table mapping
- assert(false);
- }
+ // TODO : when we hit here, we need to add instanceType -> UUID entity table mapping
+ assert(false);
+ }
}
}
public void setJobInstanceId(Long jobInstanceId) {
- this.jobInstanceId.setValue(jobInstanceId);
+ this.jobInstanceId.setValue(jobInstanceId);
}
public void setCreated(Date created) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/BaseResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/BaseResponse.java b/api/src/com/cloud/api/response/BaseResponse.java
index e873d4c..14aa2b9 100755
--- a/api/src/com/cloud/api/response/BaseResponse.java
+++ b/api/src/com/cloud/api/response/BaseResponse.java
@@ -25,7 +25,7 @@ import com.google.gson.annotations.SerializedName;
public abstract class BaseResponse implements ResponseObject {
private transient String responseName;
private transient String objectName;
-
+
@Override
public String getResponseName() {
return responseName;
@@ -35,7 +35,7 @@ public abstract class BaseResponse implements ResponseObject {
public void setResponseName(String responseName) {
this.responseName = responseName;
}
-
+
@Override
public String getObjectName() {
return objectName;
@@ -45,31 +45,31 @@ public abstract class BaseResponse implements ResponseObject {
public void setObjectName(String objectName) {
this.objectName = objectName;
}
-
+
public Long getObjectId() {
- return null;
+ return null;
}
-
+
// For use by list commands with pending async jobs
@SerializedName(ApiConstants.JOB_ID) @Param(description="the ID of the latest async job acting on this object")
protected IdentityProxy jobId = new IdentityProxy("async_job");
-
+
@SerializedName(ApiConstants.JOB_STATUS) @Param(description="the current status of the latest async job acting on this object")
private Integer jobStatus;
-
+
public Long getJobId() {
- return jobId.getValue();
+ return jobId.getValue();
}
-
+
public void setJobId(Long jobId) {
- this.jobId.setValue(jobId);
+ this.jobId.setValue(jobId);
}
-
+
public Integer getJobStatus() {
- return jobStatus;
+ return jobStatus;
}
-
+
public void setJobStatus(Integer jobStatus) {
- this.jobStatus = jobStatus;
+ this.jobStatus = jobStatus;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/CapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CapabilitiesResponse.java b/api/src/com/cloud/api/response/CapabilitiesResponse.java
index 85c97b2..fbcb385 100644
--- a/api/src/com/cloud/api/response/CapabilitiesResponse.java
+++ b/api/src/com/cloud/api/response/CapabilitiesResponse.java
@@ -27,21 +27,21 @@ public class CapabilitiesResponse extends BaseResponse {
@SerializedName("cloudstackversion") @Param(description="version of the cloud stack")
private String cloudStackVersion;
-
+
@SerializedName("userpublictemplateenabled") @Param(description="true if user and domain admins can set templates to be shared, false otherwise")
private boolean userPublicTemplateEnabled;
-
+
@SerializedName("supportELB") @Param(description="true if region supports elastic load balancer on basic zones")
private String supportELB;
-
+
@SerializedName(ApiConstants.PROJECT_INVITE_REQUIRED) @Param(description="If invitation confirmation is required when add account to project")
private Boolean projectInviteRequired;
-
+
@SerializedName(ApiConstants.ALLOW_USER_CREATE_PROJECTS) @Param(description="true if regular user is allowed to create projects")
private Boolean allowUsersCreateProjects;
-
+
@SerializedName(ApiConstants.CUSTOM_DISK_OFF_MAX_SIZE) @Param(description="maximum size that can be specified when " +
- "create disk from disk offering with custom size")
+ "create disk from disk offering with custom size")
private Long diskOffMaxSize;
@@ -61,13 +61,13 @@ public class CapabilitiesResponse extends BaseResponse {
this.supportELB = supportELB;
}
- public void setProjectInviteRequired(Boolean projectInviteRequired) {
- this.projectInviteRequired = projectInviteRequired;
- }
+ public void setProjectInviteRequired(Boolean projectInviteRequired) {
+ this.projectInviteRequired = projectInviteRequired;
+ }
- public void setAllowUsersCreateProjects(Boolean allowUsersCreateProjects) {
- this.allowUsersCreateProjects = allowUsersCreateProjects;
- }
+ public void setAllowUsersCreateProjects(Boolean allowUsersCreateProjects) {
+ this.allowUsersCreateProjects = allowUsersCreateProjects;
+ }
public void setDiskOffMaxSize(Long diskOffMaxSize) {
this.diskOffMaxSize = diskOffMaxSize;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/CapabilityResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CapabilityResponse.java b/api/src/com/cloud/api/response/CapabilityResponse.java
index 9875fe0..adb3b26 100644
--- a/api/src/com/cloud/api/response/CapabilityResponse.java
+++ b/api/src/com/cloud/api/response/CapabilityResponse.java
@@ -24,7 +24,7 @@ public class CapabilityResponse extends BaseResponse {
@SerializedName(ApiConstants.NAME) @Param(description="the capability name")
private String name;
-
+
@SerializedName(ApiConstants.VALUE) @Param(description="the capability value")
private String value;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/CapacityResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CapacityResponse.java b/api/src/com/cloud/api/response/CapacityResponse.java
index d5ff3eb..a631bf0 100755
--- a/api/src/com/cloud/api/response/CapacityResponse.java
+++ b/api/src/com/cloud/api/response/CapacityResponse.java
@@ -36,7 +36,7 @@ public class CapacityResponse extends BaseResponse {
@SerializedName("podname") @Param(description="the Pod name")
private String podName;
-
+
@SerializedName(ApiConstants.CLUSTER_ID) @Param(description="the Cluster ID")
private IdentityProxy clusterId = new IdentityProxy("cluster");
@@ -93,22 +93,22 @@ public class CapacityResponse extends BaseResponse {
}
public Long getClusterId() {
- return clusterId.getValue();
- }
+ return clusterId.getValue();
+ }
- public void setClusterId(Long clusterId) {
- this.clusterId.setValue(clusterId);
- }
+ public void setClusterId(Long clusterId) {
+ this.clusterId.setValue(clusterId);
+ }
- public String getClusterName() {
- return clusterName;
- }
+ public String getClusterName() {
+ return clusterName;
+ }
- public void setClusterName(String clusterName) {
- this.clusterName = clusterName;
- }
+ public void setClusterName(String clusterName) {
+ this.clusterName = clusterName;
+ }
- public Long getCapacityUsed() {
+ public Long getCapacityUsed() {
return capacityUsed;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/CloudIdentifierResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CloudIdentifierResponse.java b/api/src/com/cloud/api/response/CloudIdentifierResponse.java
index 91f4d59..a6e6b37 100644
--- a/api/src/com/cloud/api/response/CloudIdentifierResponse.java
+++ b/api/src/com/cloud/api/response/CloudIdentifierResponse.java
@@ -22,16 +22,16 @@ import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
public class CloudIdentifierResponse extends BaseResponse {
-
+
@SerializedName(ApiConstants.USER_ID) @Param(description="the user ID for the cloud identifier")
private IdentityProxy userId = new IdentityProxy("user");
-
+
@SerializedName("cloudidentifier") @Param(description="the cloud identifier")
private String cloudIdentifier;
-
+
@SerializedName("signature") @Param(description="the signed response for the cloud identifier")
private String signature;
-
+
public Long getUserId() {
return userId.getValue();
}
@@ -39,7 +39,7 @@ public class CloudIdentifierResponse extends BaseResponse {
public void setUserId(Long userId) {
this.userId.setValue(userId);
}
-
+
public String getCloudIdentifier() {
return cloudIdentifier;
}
@@ -47,7 +47,7 @@ public class CloudIdentifierResponse extends BaseResponse {
public void setCloudIdentifier(String cloudIdentifier) {
this.cloudIdentifier = cloudIdentifier;
}
-
+
public String getSignature() {
return signature;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ClusterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ClusterResponse.java b/api/src/com/cloud/api/response/ClusterResponse.java
index 3c00496..811731c 100755
--- a/api/src/com/cloud/api/response/ClusterResponse.java
+++ b/api/src/com/cloud/api/response/ClusterResponse.java
@@ -45,19 +45,19 @@ public class ClusterResponse extends BaseResponse {
@SerializedName("hypervisortype") @Param(description="the hypervisor type of the cluster")
private String hypervisorType;
-
+
@SerializedName("clustertype") @Param(description="the type of the cluster")
private String clusterType;
-
+
@SerializedName("allocationstate") @Param(description="the allocation state of the cluster")
private String allocationState;
-
+
@SerializedName("managedstate") @Param(description="whether this cluster is managed by cloudstack")
private String managedState;
-
+
@SerializedName("capacity") @Param(description="the capacity of the Cluster", responseObject = CapacityResponse.class)
private List<CapacityResponse> capacitites;
-
+
public Long getId() {
return id.getValue();
}
@@ -105,29 +105,29 @@ public class ClusterResponse extends BaseResponse {
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
-
+
public String getClusterType() {
- return clusterType;
+ return clusterType;
}
-
+
public void setClusterType(String clusterType) {
- this.clusterType = clusterType;
+ this.clusterType = clusterType;
}
-
+
public String getHypervisorType() {
- return this.hypervisorType;
+ return this.hypervisorType;
}
-
+
public void setHypervisorType(String hypervisorType) {
- this.hypervisorType = hypervisorType;
+ this.hypervisorType = hypervisorType;
}
-
+
public String getAllocationState() {
- return allocationState;
+ return allocationState;
}
-
+
public void setAllocationState(String allocationState) {
- this.allocationState = allocationState;
+ this.allocationState = allocationState;
}
public String getManagedState() {
@@ -138,11 +138,11 @@ public class ClusterResponse extends BaseResponse {
this.managedState = managedState;
}
- public List<CapacityResponse> getCapacitites() {
- return capacitites;
- }
+ public List<CapacityResponse> getCapacitites() {
+ return capacitites;
+ }
- public void setCapacitites(ArrayList<CapacityResponse> arrayList) {
- this.capacitites = arrayList;
- }
+ public void setCapacitites(ArrayList<CapacityResponse> arrayList) {
+ this.capacitites = arrayList;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ControlledEntityResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ControlledEntityResponse.java b/api/src/com/cloud/api/response/ControlledEntityResponse.java
index ab4a367..f44efa4 100644
--- a/api/src/com/cloud/api/response/ControlledEntityResponse.java
+++ b/api/src/com/cloud/api/response/ControlledEntityResponse.java
@@ -19,12 +19,12 @@ package com.cloud.api.response;
public interface ControlledEntityResponse {
public void setAccountName(String accountName);
-
+
public void setProjectId(Long projectId);
-
+
public void setProjectName(String projectName);
public void setDomainId(Long domainId);
-
+
public void setDomainName(String domainName);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/CreateCmdResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CreateCmdResponse.java b/api/src/com/cloud/api/response/CreateCmdResponse.java
index 66f4923..7dd922b 100644
--- a/api/src/com/cloud/api/response/CreateCmdResponse.java
+++ b/api/src/com/cloud/api/response/CreateCmdResponse.java
@@ -31,8 +31,8 @@ public class CreateCmdResponse extends BaseResponse {
public void setId(Long id) {
this.id.setValue(id);
}
-
+
public void setIdEntityTable(String entityTable) {
- this.id.setTableName(entityTable);
+ this.id.setTableName(entityTable);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/DiskOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/DiskOfferingResponse.java b/api/src/com/cloud/api/response/DiskOfferingResponse.java
index c267f6c..be86ee7 100644
--- a/api/src/com/cloud/api/response/DiskOfferingResponse.java
+++ b/api/src/com/cloud/api/response/DiskOfferingResponse.java
@@ -47,7 +47,7 @@ public class DiskOfferingResponse extends BaseResponse {
@SerializedName("iscustomized") @Param(description="true if disk offering uses custom size, false otherwise")
private Boolean customized;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the tags for the disk offering")
private String tags;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/DomainResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/DomainResponse.java b/api/src/com/cloud/api/response/DomainResponse.java
index 90997be..03738a2 100644
--- a/api/src/com/cloud/api/response/DomainResponse.java
+++ b/api/src/com/cloud/api/response/DomainResponse.java
@@ -39,13 +39,13 @@ public class DomainResponse extends BaseResponse {
@SerializedName("haschild") @Param(description="whether the domain has one or more sub-domains")
private boolean hasChild;
-
+
@SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain")
private String networkDomain;
@SerializedName(ApiConstants.PATH) @Param(description="the path of the domain")
private String path;
-
+
public Long getId() {
return id.getValue();
}
@@ -98,12 +98,12 @@ public class DomainResponse extends BaseResponse {
this.networkDomain = networkDomain;
}
- public String getPath() {
- return path;
- }
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
- public void setPath(String path) {
- this.path = path;
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/DomainRouterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/DomainRouterResponse.java b/api/src/com/cloud/api/response/DomainRouterResponse.java
index c284982..8170b2e 100644
--- a/api/src/com/cloud/api/response/DomainRouterResponse.java
+++ b/api/src/com/cloud/api/response/DomainRouterResponse.java
@@ -29,12 +29,12 @@ import com.google.gson.annotations.SerializedName;
public class DomainRouterResponse extends BaseResponse implements ControlledEntityResponse{
@SerializedName(ApiConstants.ID) @Param(description="the id of the router")
private IdentityProxy id = new IdentityProxy("vm_instance");
-
+
@SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID for the router")
private IdentityProxy zoneId = new IdentityProxy("data_center");
@SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the router")
- private String zoneName;
+ private String zoneName;
@SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the router")
private String dns1;
@@ -68,7 +68,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
@SerializedName(ApiConstants.LINK_LOCAL_MAC_NETMASK) @Param(description="the link local netmask for the router")
private String linkLocalNetmask;
-
+
@SerializedName(ApiConstants.LINK_LOCAL_NETWORK_ID) @Param(description="the ID of the corresponding link local network")
private IdentityProxy linkLocalNetworkId = new IdentityProxy("networks");
@@ -80,7 +80,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
@SerializedName("publicnetmask") @Param(description="the public netmask for the router")
private String publicNetmask;
-
+
@SerializedName("publicnetworkid") @Param(description="the ID of the corresponding public network")
private IdentityProxy publicNetworkId = new IdentityProxy("networks");
@@ -92,7 +92,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
@SerializedName("guestnetmask") @Param(description="the guest netmask for the router")
private String guestNetmask;
-
+
@SerializedName("guestnetworkid") @Param(description="the ID of the corresponding guest network")
private IdentityProxy guestNetworkId = new IdentityProxy("networks");
@@ -107,10 +107,10 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the router")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
private String projectName;
@@ -119,35 +119,35 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain associated with the router")
private String domainName;
-
+
@SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering of the virtual machine")
private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
@SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
private String serviceOfferingName;
-
+
@SerializedName("isredundantrouter") @Param(description="if this router is an redundant virtual router")
private boolean isRedundantRouter;
-
+
@SerializedName("redundantstate") @Param(description="the state of redundant virtual router")
private String redundantState;
-
+
@SerializedName("templateversion") @Param(description="the version of template")
private String templateVersion;
-
+
@SerializedName("scriptsversion") @Param(description="the version of scripts")
private String scriptsVersion;
-
+
@SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the network belongs to")
private IdentityProxy vpcId = new IdentityProxy("vpc");
-
- @SerializedName("nic") @Param(description="the list of nics associated with the router",
+
+ @SerializedName("nic") @Param(description="the list of nics associated with the router",
responseObject = NicResponse.class, since="4.0")
private List<NicResponse> nics;
-
+
@Override
public Long getObjectId() {
- return getId();
+ return getId();
}
public Long getId() {
@@ -260,7 +260,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
public void setLinkLocalIp(String linkLocalIp) {
this.linkLocalIp = linkLocalIp;
}
-
+
public void setLinkLocalMacAddress(String linkLocalMacAddress) {
this.linkLocalMacAddress = linkLocalMacAddress;
}
@@ -292,15 +292,15 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
public String getTemplateVersion() {
return this.templateVersion;
}
-
+
public void setTemplateVersion(String templateVersion) {
this.templateVersion = templateVersion;
}
-
+
public String getScriptsVersion() {
return this.scriptsVersion;
}
-
+
public void setScriptsVersion(String scriptsVersion) {
this.scriptsVersion = scriptsVersion;
}
@@ -313,11 +313,11 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setVpcId(Long vpcId) {
this.vpcId.setValue(vpcId);
}
-
+
public void setNics(List<NicResponse> nics) {
this.nics = nics;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/EventResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/EventResponse.java b/api/src/com/cloud/api/response/EventResponse.java
index dd1dc04..b8b5dfd 100644
--- a/api/src/com/cloud/api/response/EventResponse.java
+++ b/api/src/com/cloud/api/response/EventResponse.java
@@ -43,10 +43,10 @@ public class EventResponse extends BaseResponse implements ControlledEntityRespo
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name for the account that owns the object being acted on in the event (e.g. the owner of the virtual machine, ip address, or security group)")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
private String projectName;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ExceptionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ExceptionResponse.java b/api/src/com/cloud/api/response/ExceptionResponse.java
index 9ff2cf1..995f5c4 100644
--- a/api/src/com/cloud/api/response/ExceptionResponse.java
+++ b/api/src/com/cloud/api/response/ExceptionResponse.java
@@ -31,8 +31,8 @@ public class ExceptionResponse extends BaseResponse {
private Integer errorCode;
@SerializedName("cserrorcode") @Param(description="cloudstack exception error code associated with this error")
- private Integer csErrorCode;
-
+ private Integer csErrorCode;
+
@SerializedName("errortext") @Param(description="the text associated with this error")
private String errorText = "Command failed due to Internal Server Error";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ExtractResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ExtractResponse.java b/api/src/com/cloud/api/response/ExtractResponse.java
index 9f4cf6a..5d9fde9 100755
--- a/api/src/com/cloud/api/response/ExtractResponse.java
+++ b/api/src/com/cloud/api/response/ExtractResponse.java
@@ -26,37 +26,37 @@ import com.google.gson.annotations.SerializedName;
public class ExtractResponse extends BaseResponse {
@SerializedName(ApiConstants.ID) @Param(description="the id of extracted object")
private IdentityProxy id = new IdentityProxy("vm_template");
-
+
@SerializedName(ApiConstants.NAME) @Param(description="the name of the extracted object")
private String name;
-
+
@SerializedName("extractId") @Param(description="the upload id of extracted object")
private IdentityProxy uploadId = new IdentityProxy("async_job");
-
+
@SerializedName("uploadpercentage") @Param(description="the percentage of the entity uploaded to the specified location")
private Integer uploadPercent;
-
+
@SerializedName("status") @Param(description="the status of the extraction")
private String status;
-
+
@SerializedName("accountid") @Param(description="the account id to which the extracted object belongs")
- private IdentityProxy accountId = new IdentityProxy("account");
-
+ private IdentityProxy accountId = new IdentityProxy("account");
+
@SerializedName("resultstring") @Param(includeInApiDoc=false)
- private String resultString;
+ private String resultString;
@SerializedName(ApiConstants.CREATED) @Param(description="the time and date the object was created")
private Date createdDate;
@SerializedName(ApiConstants.STATE) @Param(description="the state of the extracted object")
private String state;
-
+
@SerializedName("storagetype") @Param(description="type of the storage")
private String storageType;
@SerializedName("storage")
private String storage;
-
+
@SerializedName(ApiConstants.ZONE_ID) @Param(description="zone ID the object was extracted from")
private IdentityProxy zoneId = new IdentityProxy("data_center");
@@ -65,20 +65,20 @@ public class ExtractResponse extends BaseResponse {
@SerializedName("extractMode") @Param(description="the mode of extraction - upload or download")
private String mode;
-
+
@SerializedName(ApiConstants.URL) @Param(description="if mode = upload then url of the uploaded entity. if mode = download the url from which the entity can be downloaded")
- private String url;
-
- public ExtractResponse(){
+ private String url;
+
+ public ExtractResponse(){
}
-
+
public ExtractResponse(Long typeId, String typeName, long accountId,
String state, Long uploadId) {
this.id.setValue(typeId);
this.name = typeName;
this.accountId.setValue(accountId);
this.state = state;
- this.uploadId.setValue(uploadId);
+ this.uploadId.setValue(uploadId);
}
public Long getId() {
@@ -88,9 +88,9 @@ public class ExtractResponse extends BaseResponse {
public void setId(long id) {
this.id.setValue(id);
}
-
+
public void setIdentityTableName(String tableName) {
- this.id.setTableName(tableName);
+ this.id.setTableName(tableName);
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/FirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/FirewallResponse.java b/api/src/com/cloud/api/response/FirewallResponse.java
index c3d2f75..fa9ebdf 100644
--- a/api/src/com/cloud/api/response/FirewallResponse.java
+++ b/api/src/com/cloud/api/response/FirewallResponse.java
@@ -36,19 +36,19 @@ public class FirewallResponse extends BaseResponse {
@SerializedName(ApiConstants.END_PORT) @Param(description = "the ending port of firewall rule's port range")
private String endPort;
-
+
@SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public ip address id for the firewall rule")
private Long publicIpAddressId;
@SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip address for the firewall rule")
private String publicIpAddress;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
private String state;
@SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
private String cidrList;
-
+
@SerializedName(ApiConstants.ICMP_TYPE) @Param(description= "type of the icmp message being sent")
private Integer icmpType;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/FirewallRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/FirewallRuleResponse.java b/api/src/com/cloud/api/response/FirewallRuleResponse.java
index 4c1ffb5..adf7353 100644
--- a/api/src/com/cloud/api/response/FirewallRuleResponse.java
+++ b/api/src/com/cloud/api/response/FirewallRuleResponse.java
@@ -51,22 +51,22 @@ public class FirewallRuleResponse extends BaseResponse{
@SerializedName("virtualmachinedisplayname") @Param(description="the VM display name for the port forwarding rule")
private String virtualMachineDisplayName;
-
+
@SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public ip address id for the port forwarding rule")
private IdentityProxy publicIpAddressId = new IdentityProxy("user_ip_address");
@SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip address for the port forwarding rule")
private String publicIpAddress;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
private String state;
@SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
private String cidrList;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
-
+
public Long getId() {
return id.getValue();
}
@@ -89,8 +89,8 @@ public class FirewallRuleResponse extends BaseResponse{
public void setPrivateEndPort(String privatePort) {
this.privateEndPort = privatePort;
- }
-
+ }
+
public String getProtocol() {
return protocol;
}
@@ -106,7 +106,7 @@ public class FirewallRuleResponse extends BaseResponse{
public String getPublicEndPort() {
return publicEndPort;
}
-
+
public void setPublicStartPort(String publicPort) {
this.publicStartPort = publicPort;
}
@@ -131,21 +131,21 @@ public class FirewallRuleResponse extends BaseResponse{
this.virtualMachineName = virtualMachineName;
}
- public String getVirtualMachineDisplayName() {
- return virtualMachineDisplayName;
- }
+ public String getVirtualMachineDisplayName() {
+ return virtualMachineDisplayName;
+ }
- public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- }
+ public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
+ this.virtualMachineDisplayName = virtualMachineDisplayName;
+ }
- public String getPublicIpAddress() {
- return publicIpAddress;
- }
+ public String getPublicIpAddress() {
+ return publicIpAddress;
+ }
- public void setPublicIpAddress(String publicIpAddress) {
- this.publicIpAddress = publicIpAddress;
- }
+ public void setPublicIpAddress(String publicIpAddress) {
+ this.publicIpAddress = publicIpAddress;
+ }
public String getState() {
return state;
@@ -162,7 +162,7 @@ public class FirewallRuleResponse extends BaseResponse{
public void setPublicIpAddressId(Long publicIpAddressId) {
this.publicIpAddressId.setValue(publicIpAddressId);
}
-
+
public String getCidrList() {
return cidrList;
}
@@ -170,7 +170,7 @@ public class FirewallRuleResponse extends BaseResponse{
public void setCidrList(String cidrs) {
this.cidrList = cidrs;
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/GetVMPasswordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/GetVMPasswordResponse.java b/api/src/com/cloud/api/response/GetVMPasswordResponse.java
index 41f1b6d..c9638ff 100644
--- a/api/src/com/cloud/api/response/GetVMPasswordResponse.java
+++ b/api/src/com/cloud/api/response/GetVMPasswordResponse.java
@@ -20,12 +20,12 @@ import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
public class GetVMPasswordResponse extends BaseResponse {
-
+
@SerializedName("encryptedpassword") @Param(description="The encrypted password of the VM")
private String encryptedPassword;
-
+
public GetVMPasswordResponse() {}
-
+
public GetVMPasswordResponse(String responseName, String encryptedPassword) {
setResponseName(responseName);
setObjectName("password");
@@ -39,5 +39,5 @@ public class GetVMPasswordResponse extends BaseResponse {
public void setEncryptedPassword(String encryptedPassword) {
this.encryptedPassword = encryptedPassword;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java b/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
index f458aba..1f7e7ad 100644
--- a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
+++ b/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
@@ -26,7 +26,7 @@ public class GuestOSCategoryResponse extends BaseResponse {
private IdentityProxy id = new IdentityProxy("guest_os_category");
@SerializedName(ApiConstants.NAME) @Param(description="the name of the OS category")
- private String name;
+ private String name;
public Long getId() {
return id.getValue();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/HostResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/HostResponse.java b/api/src/com/cloud/api/response/HostResponse.java
index a593cdf..db0b26a 100755
--- a/api/src/com/cloud/api/response/HostResponse.java
+++ b/api/src/com/cloud/api/response/HostResponse.java
@@ -161,7 +161,7 @@ public class HostResponse extends BaseResponse {
public Long getObjectId() {
return getId();
}
-
+
public Long getId() {
return id.getValue();
}
@@ -217,7 +217,7 @@ public class HostResponse extends BaseResponse {
public void setVersion(String version) {
this.version = version;
}
-
+
public void setHypervisor(HypervisorType hypervisor) {
this.hypervisor = hypervisor;
}
@@ -225,7 +225,7 @@ public class HostResponse extends BaseResponse {
public void setCpuNumber(Integer cpuNumber) {
this.cpuNumber = cpuNumber;
}
-
+
public void setCpuSpeed(Long cpuSpeed) {
this.cpuSpeed = cpuSpeed;
}
@@ -321,11 +321,11 @@ public class HostResponse extends BaseResponse {
public void setHasEnoughCapacity(Boolean hasEnoughCapacity) {
this.hasEnoughCapacity = hasEnoughCapacity;
}
-
+
public void setSuitableForMigration(Boolean suitableForMigration) {
this.suitableForMigration = suitableForMigration;
- }
+ }
public String getResourceState() {
return resourceState;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/IPAddressResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IPAddressResponse.java b/api/src/com/cloud/api/response/IPAddressResponse.java
index fb89bec..a8294df 100644
--- a/api/src/com/cloud/api/response/IPAddressResponse.java
+++ b/api/src/com/cloud/api/response/IPAddressResponse.java
@@ -28,7 +28,7 @@ import com.google.gson.annotations.SerializedName;
public class IPAddressResponse extends BaseResponse implements ControlledEntityResponse {
@SerializedName(ApiConstants.ID) @Param(description="public IP address id")
private IdentityProxy id = new IdentityProxy("user_ip_address");
-
+
@SerializedName(ApiConstants.IP_ADDRESS) @Param(description="public IP address")
private String ipAddress;
@@ -46,10 +46,10 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account the public IP address is associated with")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
private String projectName;
@@ -63,7 +63,7 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
private Boolean forVirtualNetwork;
@SerializedName(ApiConstants.VLAN_ID) @Param(description="the ID of the VLAN associated with the IP address." +
- " This parameter is visible to ROOT admins only")
+ " This parameter is visible to ROOT admins only")
private IdentityProxy vlanId = new IdentityProxy("vlan");
@SerializedName("vlanname") @Param(description="the VLAN associated with the IP address")
@@ -71,46 +71,46 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
@SerializedName("isstaticnat") @Param(description="true if this ip is for static nat, false otherwise")
private Boolean staticNat;
-
+
@SerializedName(ApiConstants.IS_SYSTEM) @Param(description="true if this ip is system ip (was allocated as a part of deployVm or createLbRule)")
private Boolean isSystem;
-
+
@SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) @Param(description="virutal machine id the ip address is assigned to (not null only for static nat Ip)")
private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
-
+
@SerializedName("virtualmachinename") @Param(description="virutal machine name the ip address is assigned to (not null only for static nat Ip)")
private String virtualMachineName;
-
+
@SerializedName("virtualmachinedisplayname") @Param(description="virutal machine display name the ip address is assigned to (not null only for static nat Ip)")
private String virtualMachineDisplayName;
-
+
@SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID) @Param(description="the ID of the Network associated with the IP address")
private IdentityProxy associatedNetworkId = new IdentityProxy("networks");
-
+
@SerializedName(ApiConstants.ASSOCIATED_NETWORK_NAME) @Param(description="the name of the Network associated with the IP address")
private String associatedNetworkName;
-
+
@SerializedName(ApiConstants.NETWORK_ID) @Param(description="the ID of the Network where ip belongs to")
private IdentityProxy networkId = new IdentityProxy("networks");
-
+
@SerializedName(ApiConstants.STATE) @Param(description="State of the ip address. Can be: Allocatin, Allocated and Releasing")
private String state;
-
+
@SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
+
@SerializedName(ApiConstants.PURPOSE) @Param(description="purpose of the IP address. In Acton this value is not null for Ips with isSystem=true, and can have either StaticNat or LB value")
private String purpose;
-
+
@SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the ip belongs to")
private IdentityProxy vpcId = new IdentityProxy("vpc");
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with ip address", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
-/*
+/*
@SerializedName(ApiConstants.JOB_ID) @Param(description="shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the volume")
private IdentityProxy jobId = new IdentityProxy("async_job");
-*/
+*/
public void setIpAddress(String ipAddress) {
@@ -120,7 +120,7 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
public void setAllocated(Date allocated) {
this.allocated = allocated;
}
-
+
public void setZoneId(Long zoneId) {
this.zoneId.setValue(zoneId);
}
@@ -142,7 +142,7 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
public void setDomainId(Long domainId) {
this.domainId.setValue(domainId);
}
-
+
@Override
public void setDomainName(String domainName) {
this.domainName = domainName;
@@ -160,9 +160,9 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
this.vlanName = vlanName;
}
- public void setStaticNat(Boolean staticNat) {
- this.staticNat = staticNat;
- }
+ public void setStaticNat(Boolean staticNat) {
+ this.staticNat = staticNat;
+ }
public void setAssociatedNetworkId(Long networkId) {
this.associatedNetworkId.setValue(networkId);
@@ -210,23 +210,23 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setPhysicalNetworkId(long physicalNetworkId) {
this.physicalNetworkId.setValue(physicalNetworkId);
}
- public void setIsSystem(Boolean isSystem) {
- this.isSystem = isSystem;
- }
+ public void setIsSystem(Boolean isSystem) {
+ this.isSystem = isSystem;
+ }
public void setPurpose(String purpose) {
this.purpose = purpose;
}
-
+
public void setVpcId(Long vpcId) {
this.vpcId.setValue(vpcId);
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/InstanceGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/InstanceGroupResponse.java b/api/src/com/cloud/api/response/InstanceGroupResponse.java
index 18607c7..ba9963a 100644
--- a/api/src/com/cloud/api/response/InstanceGroupResponse.java
+++ b/api/src/com/cloud/api/response/InstanceGroupResponse.java
@@ -36,10 +36,10 @@ public class InstanceGroupResponse extends BaseResponse implements ControlledEnt
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the instance group")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the group")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the group")
private String projectName;
@@ -75,7 +75,7 @@ public class InstanceGroupResponse extends BaseResponse implements ControlledEnt
public void setDomainName(String domainName) {
this.domainName = domainName;
}
-
+
@Override
public void setProjectId(Long projectId) {
this.projectId.setValue(projectId);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java b/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
index 87e9590..65a349a 100644
--- a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
+++ b/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
@@ -36,22 +36,22 @@ public class IpForwardingRuleResponse extends BaseResponse {
@SerializedName("virtualmachinedisplayname") @Param(description="the VM display name for the port forwarding rule")
private String virtualMachineDisplayName;
-
+
@SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public ip address id for the port forwarding rule")
private Long publicIpAddressId;
@SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip address for the port forwarding rule")
private String publicIpAddress;
-
+
@SerializedName(ApiConstants.START_PORT) @Param(description="the start port of the rule")
private Integer startPort;
-
+
@SerializedName(ApiConstants.END_PORT) @Param(description="the end port of the rule")
private Integer endPort;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="state of the ip forwarding rule")
private String state;
-
+
public Long getId() {
return id.getValue();
}
@@ -84,21 +84,21 @@ public class IpForwardingRuleResponse extends BaseResponse {
this.virtualMachineName = virtualMachineName;
}
- public String getVirtualMachineDisplayName() {
- return virtualMachineDisplayName;
- }
+ public String getVirtualMachineDisplayName() {
+ return virtualMachineDisplayName;
+ }
- public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- }
+ public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
+ this.virtualMachineDisplayName = virtualMachineDisplayName;
+ }
- public String getPublicIpAddress() {
- return publicIpAddress;
- }
+ public String getPublicIpAddress() {
+ return publicIpAddress;
+ }
- public void setPublicIpAddress(String publicIpAddress) {
- this.publicIpAddress = publicIpAddress;
- }
+ public void setPublicIpAddress(String publicIpAddress) {
+ this.publicIpAddress = publicIpAddress;
+ }
public String getState() {
return state;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/IsoVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IsoVmResponse.java b/api/src/com/cloud/api/response/IsoVmResponse.java
index 29a898a..fb5fa86 100755
--- a/api/src/com/cloud/api/response/IsoVmResponse.java
+++ b/api/src/com/cloud/api/response/IsoVmResponse.java
@@ -54,7 +54,7 @@ public class IsoVmResponse extends BaseResponse {
@SerializedName("vmstate") @Param(description="state of the virtual machine")
private String virtualMachineState;
-
+
public Long getOsTypeId() {
return osTypeId.getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java b/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
index 0d1212d..a6743a7 100644
--- a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
+++ b/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
@@ -30,7 +30,7 @@ public class LBStickinessPolicyResponse extends BaseResponse {
@SerializedName("id")
@Param(description = "the LB Stickiness policy ID")
private IdentityProxy id = new IdentityProxy("load_balancer_stickiness_policies");
-
+
@SerializedName("name")
@Param(description = "the name of the Stickiness policy")
private String name;
@@ -54,7 +54,7 @@ public class LBStickinessPolicyResponse extends BaseResponse {
@SerializedName("params")
@Param(description = "the params of the policy")
private Map<String, String> params;
-
+
public Map<String, String> getParams() {
return params;
}
@@ -82,7 +82,7 @@ public class LBStickinessPolicyResponse extends BaseResponse {
public String getMethodName() {
return methodName;
}
-
+
public String getState() {
return state;
}
@@ -102,9 +102,9 @@ public class LBStickinessPolicyResponse extends BaseResponse {
if (stickinesspolicy.getId() != 0)
setId(stickinesspolicy.getId());
- /* Get the param and values from the database and fill the response object
- * The following loop is to
- * 1) convert from List of Pair<String,String> to Map<String, String>
+ /* Get the param and values from the database and fill the response object
+ * The following loop is to
+ * 1) convert from List of Pair<String,String> to Map<String, String>
* 2) combine all params with name with ":" , currently we have one param called "domain" that can appear multiple times.
* */
@@ -118,7 +118,7 @@ public class LBStickinessPolicyResponse extends BaseResponse {
{
sb.append(":").append(tempParamList.get(key));
}
-
+
tempParamList.put(key,sb.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/LBStickinessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LBStickinessResponse.java b/api/src/com/cloud/api/response/LBStickinessResponse.java
index 8a66c89..ea3be69 100644
--- a/api/src/com/cloud/api/response/LBStickinessResponse.java
+++ b/api/src/com/cloud/api/response/LBStickinessResponse.java
@@ -39,7 +39,7 @@ public class LBStickinessResponse extends BaseResponse {
@SerializedName("account")
@Param(description = "the account of the Stickiness policy")
private String accountName;
-
+
@SerializedName(ApiConstants.DOMAIN_ID)
@Param(description = "the domain ID of the Stickiness policy")
private IdentityProxy domainId = new IdentityProxy("domain");
@@ -51,7 +51,7 @@ public class LBStickinessResponse extends BaseResponse {
@SerializedName("state")
@Param(description = "the state of the policy")
private String state;
-
+
@SerializedName(ApiConstants.ZONE_ID)
@Param(description = "the id of the zone the Stickiness policy belongs to")
private IdentityProxy zoneId = new IdentityProxy("data_center");
@@ -79,11 +79,11 @@ public class LBStickinessResponse extends BaseResponse {
public List<LBStickinessPolicyResponse> getStickinessPolicies() {
return stickinessPolicies;
}
-
+
public String getDescription() {
return description;
}
-
+
public void setDescription(String description) {
this.description = description;
}
@@ -99,11 +99,11 @@ public class LBStickinessResponse extends BaseResponse {
public void setDomainId(Long domainId) {
this.domainId.setValue(domainId);
}
-
+
public void setZoneId(Long zoneId) {
this.zoneId.setValue(zoneId);
}
-
+
public String getDomainName() {
return domainName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/LDAPConfigResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LDAPConfigResponse.java b/api/src/com/cloud/api/response/LDAPConfigResponse.java
index cf62698..db89bdf 100644
--- a/api/src/com/cloud/api/response/LDAPConfigResponse.java
+++ b/api/src/com/cloud/api/response/LDAPConfigResponse.java
@@ -98,6 +98,6 @@ public class LDAPConfigResponse extends BaseResponse {
public void setBindPassword(String bindPassword) {
this.bindPassword = bindPassword;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ListResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ListResponse.java b/api/src/com/cloud/api/response/ListResponse.java
index 3cf9860..5c8e83c 100644
--- a/api/src/com/cloud/api/response/ListResponse.java
+++ b/api/src/com/cloud/api/response/ListResponse.java
@@ -31,22 +31,22 @@ public class ListResponse<T extends ResponseObject> extends BaseResponse {
public void setResponses(List<T> responses) {
this.responses = responses;
}
-
+
public void setResponses(List<T> responses, Integer count) {
this.responses = responses;
this.count = count;
}
-
+
public Integer getCount() {
if (count != null) {
return count;
}
-
+
if (responses != null) {
return responses.size();
}
-
+
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/LoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LoadBalancerResponse.java b/api/src/com/cloud/api/response/LoadBalancerResponse.java
index a4ad57a..6b104f5 100644
--- a/api/src/com/cloud/api/response/LoadBalancerResponse.java
+++ b/api/src/com/cloud/api/response/LoadBalancerResponse.java
@@ -56,17 +56,17 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
@SerializedName(ApiConstants.ALGORITHM)
@Param(description = "the load balancer algorithm (source, roundrobin, leastconn)")
private String algorithm;
-
+
@SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
private String cidrList;
@SerializedName(ApiConstants.ACCOUNT)
@Param(description = "the account of the load balancer rule")
private String accountName;
-
+
@SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the load balancer")
private IdentityProxy projectId = new IdentityProxy("projects");
-
+
@SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the load balancer")
private String projectName;
@@ -85,7 +85,7 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
@SerializedName(ApiConstants.ZONE_ID)
@Param(description = "the id of the zone the rule belongs to")
private IdentityProxy zoneId = new IdentityProxy("data_center");
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with load balancer", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
@@ -154,9 +154,9 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
public void setProjectName(String projectName) {
this.projectName = projectName;
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/NetworkACLResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkACLResponse.java b/api/src/com/cloud/api/response/NetworkACLResponse.java
index fcd40d1..fc567d5 100644
--- a/api/src/com/cloud/api/response/NetworkACLResponse.java
+++ b/api/src/com/cloud/api/response/NetworkACLResponse.java
@@ -39,19 +39,19 @@ public class NetworkACLResponse extends BaseResponse {
@SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type for the ACL")
private String trafficType;
-
+
@SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
private String state;
@SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
private String cidrList;
-
+
@SerializedName(ApiConstants.ICMP_TYPE) @Param(description= "type of the icmp message being sent")
private Integer icmpType;
@SerializedName(ApiConstants.ICMP_CODE) @Param(description = "error code for this icmp message")
private Integer icmpCode;
-
+
@SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with the network ACLs",
responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
@@ -91,7 +91,7 @@ public class NetworkACLResponse extends BaseResponse {
public void setTrafficType(String trafficType) {
this.trafficType = trafficType;
}
-
+
public void setTags(List<ResourceTagResponse> tags) {
this.tags = tags;
}