You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/10 01:48:36 UTC
[28/52] [partial] Summary: Fixes for api_refactoring
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java b/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java
deleted file mode 100644
index d0d249d..0000000
--- a/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java
+++ /dev/null
@@ -1,143 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-
-public class AutoScaleVmGroupResponse extends BaseResponse implements ControlledEntityResponse {
-
- @SerializedName(ApiConstants.ID)
- @Param(description = "the autoscale vm group ID")
- private IdentityProxy id = new IdentityProxy("autoscale_vmgroups");
-
- @SerializedName(ApiConstants.LBID)
- @Param(description = "the load balancer rule ID")
- private IdentityProxy loadBalancerId = new IdentityProxy("firewall_rules");
-
- @SerializedName(ApiConstants.VMPROFILE_ID)
- @Param(description = "the autoscale profile that contains information about the vms in the vm group.")
- private IdentityProxy profileId = new IdentityProxy("autoscale_vmprofiles");
-
- @SerializedName(ApiConstants.MIN_MEMBERS)
- @Param(description = "the minimum number of members in the vmgroup, the number of instances in the vm group will be equal to or more than this number.")
- private int minMembers;
-
- @SerializedName(ApiConstants.MAX_MEMBERS)
- @Param(description = "the maximum number of members in the vmgroup, The number of instances in the vm group will be equal to or less than this number.")
- private int maxMembers;
-
- @SerializedName(ApiConstants.INTERVAL)
- @Param(description = "the frequency at which the conditions have to be evaluated")
- private int interval;
-
- @SerializedName(ApiConstants.STATE)
- @Param(description = "the current state of the AutoScale Vm Group")
- private String state;
-
- @SerializedName(ApiConstants.SCALEUP_POLICIES)
- @Param(description = "list of scaleup autoscale policies")
- private List<AutoScalePolicyResponse> scaleUpPolicies;
-
- @SerializedName(ApiConstants.SCALEDOWN_POLICIES)
- @Param(description = "list of scaledown autoscale policies")
- private List<AutoScalePolicyResponse> scaleDownPolicies;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the instance group")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id vm profile")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm profile")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the vm profile")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the vm profile")
- private String domainName;
-
- public AutoScaleVmGroupResponse() {
-
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setLoadBalancerId(Long loadBalancerId) {
- this.loadBalancerId.setValue(loadBalancerId);
- }
-
- public void setProfileId(Long profileId) {
- this.profileId.setValue(profileId);
- }
-
- public void setMinMembers(int minMembers) {
- this.minMembers = minMembers;
- }
-
- public void setMaxMembers(int maxMembers) {
- this.maxMembers = maxMembers;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public void setInterval(int interval) {
- this.interval = interval;
- }
-
- public void setScaleUpPolicies(List<AutoScalePolicyResponse> scaleUpPolicies) {
- this.scaleUpPolicies = scaleUpPolicies;
- }
-
- public void setScaleDownPolicies(List<AutoScalePolicyResponse> scaleDownPolicies) {
- this.scaleDownPolicies = scaleDownPolicies;
- }
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java b/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java
deleted file mode 100644
index 08d9526..0000000
--- a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java
+++ /dev/null
@@ -1,160 +0,0 @@
-// 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.response;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.api.BaseCmd.CommandType;
-import com.cloud.api.Parameter;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.utils.Pair;
-import com.google.gson.annotations.SerializedName;
-
-public class AutoScaleVmProfileResponse extends BaseResponse implements ControlledEntityResponse {
-
- @SerializedName(ApiConstants.ID)
- @Param(description = "the autoscale vm profile ID")
- private IdentityProxy id = new IdentityProxy("autoscale_vmprofiles");
-
- /* Parameters related to deploy virtual machine */
- @SerializedName(ApiConstants.ZONE_ID)
- @Param(description = "the availability zone to be used while deploying a virtual machine")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
- @Param(description = "the service offering to be used while deploying a virtual machine")
- private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
-
- @SerializedName(ApiConstants.TEMPLATE_ID)
- @Param(description = "the template to be used while deploying a virtual machine")
- private IdentityProxy templateId = new IdentityProxy("vm_template");
-
- @SerializedName(ApiConstants.OTHER_DEPLOY_PARAMS)
- @Param(description = "parameters other than zoneId/serviceOfferringId/templateId to be used while deploying a virtual machine")
- private String otherDeployParams;
-
- /* Parameters related to destroying a virtual machine */
- @SerializedName(ApiConstants.AUTOSCALE_VM_DESTROY_TIME)
- @Param(description = "the time allowed for existing connections to get closed before a vm is destroyed")
- private Integer destroyVmGraceperiod;
-
- /* Parameters related to a running virtual machine - monitoring aspects */
- @SerializedName(ApiConstants.COUNTERPARAM_LIST)
- @Parameter(name = ApiConstants.COUNTERPARAM_LIST, type = CommandType.MAP, description = "counterparam list. Example: counterparam[0].name=snmpcommunity&counterparam[0].value=public&counterparam[1].name=snmpport&counterparam[1].value=161")
- private Map<String, String> counterParams;
-
- @SerializedName(ApiConstants.AUTOSCALE_USER_ID)
- @Param(description = "the ID of the user used to launch and destroy the VMs")
- private IdentityProxy autoscaleUserId = new IdentityProxy("user");
-
- @Parameter(name = ApiConstants.CS_URL, type = CommandType.STRING, description = "the API URL including port of the CloudStack Management Server example: http://server.cloud.com:8080/client/api?")
- private String csUrl;
-
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the account owning the instance group")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID)
- @Param(description = "the project id vm profile")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT)
- @Param(description = "the project name of the vm profile")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "the domain ID of the vm profile")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "the domain name of the vm profile")
- private String domainName;
-
- public AutoScaleVmProfileResponse() {
-
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public void setServiceOfferingId(Long serviceOfferingId) {
- this.serviceOfferingId.setValue(serviceOfferingId);
- }
-
- public void setTemplateId(Long templateId) {
- this.templateId.setValue(templateId);
- }
-
- public void setOtherDeployParams(String otherDeployParams) {
- this.otherDeployParams = otherDeployParams;
- }
-
- public void setCounterParams(List<Pair<String, String>> counterParams) {
- this.counterParams = new HashMap<String, String>();
- for (Pair<String, String> paramKV : counterParams) {
- String key = paramKV.first();
- String value = paramKV.second();
- this.counterParams.put(key, value);
- }
- }
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public void setAutoscaleUserId(Long autoscaleUserId) {
- this.autoscaleUserId.setValue(autoscaleUserId);
- }
-
- public void setDestroyVmGraceperiod(Integer destroyVmGraceperiod) {
- this.destroyVmGraceperiod = destroyVmGraceperiod;
- }
-
- public void setCsUrl(String csUrl) {
- this.csUrl = csUrl;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100755
index e343a10..0000000
--- a/api/src/com/cloud/api/response/BaseResponse.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.api.ResponseObject;
-import com.cloud.serializer.Param;
-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;
- }
-
- @Override
- public void setResponseName(String responseName) {
- this.responseName = responseName;
- }
-
- @Override
- public String getObjectName() {
- return objectName;
- }
-
- @Override
- public void setObjectName(String objectName) {
- this.objectName = objectName;
- }
-
- public Long getObjectId() {
- 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();
- }
-
- public void setJobId(Long jobId) {
- this.jobId.setValue(jobId);
- }
-
- public Integer getJobStatus() {
- return jobStatus;
- }
-
- public void setJobStatus(Integer jobStatus) {
- this.jobStatus = jobStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 4d98e17..0000000
--- a/api/src/com/cloud/api/response/CapabilitiesResponse.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class CapabilitiesResponse extends BaseResponse {
- @SerializedName("securitygroupsenabled") @Param(description="true if security groups support is enabled, false otherwise")
- private boolean securityGroupsEnabled;
-
- @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")
- private Long diskOffMaxSize;
-
-
- public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
- this.securityGroupsEnabled = securityGroupsEnabled;
- }
-
- public void setCloudStackVersion(String cloudStackVersion) {
- this.cloudStackVersion = cloudStackVersion;
- }
-
- public void setUserPublicTemplateEnabled(boolean userPublicTemplateEnabled) {
- this.userPublicTemplateEnabled = userPublicTemplateEnabled;
- }
-
- public void setSupportELB(String supportELB) {
- this.supportELB = supportELB;
- }
-
- public void setProjectInviteRequired(Boolean projectInviteRequired) {
- this.projectInviteRequired = projectInviteRequired;
- }
-
- 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/c4c9d2d8/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
deleted file mode 100644
index 0281c18..0000000
--- a/api/src/com/cloud/api/response/CapabilityResponse.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-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;
-
- @SerializedName(ApiConstants.CAN_CHOOSE_SERVICE_CAPABILITY) @Param(description="can this service capability value can be choosable while creatine network offerings")
- private boolean canChoose;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public boolean getCanChoose() {
- return canChoose;
- }
-
- public void setCanChoose(boolean choosable) {
- this.canChoose = choosable;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100755
index d38d9ad..0000000
--- a/api/src/com/cloud/api/response/CapacityResponse.java
+++ /dev/null
@@ -1,134 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class CapacityResponse extends BaseResponse {
- @SerializedName(ApiConstants.TYPE) @Param(description="the capacity type")
- private Short capacityType;
-
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name")
- private String zoneName;
-
- @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID")
- private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
- @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");
-
- @SerializedName("clustername") @Param(description="the Cluster name")
- private String clusterName;
-
- @SerializedName("capacityused") @Param(description="the capacity currently in use")
- private Long capacityUsed;
-
- @SerializedName("capacitytotal") @Param(description="the total capacity available")
- private Long capacityTotal;
-
- @SerializedName("percentused") @Param(description="the percentage of capacity currently in use")
- private String percentUsed;
-
- public Short getCapacityType() {
- return capacityType;
- }
-
- public void setCapacityType(Short capacityType) {
- this.capacityType = capacityType;
- }
-
- public Long getZoneId() {
- return zoneId.getValue();
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public Long getPodId() {
- return podId.getValue();
- }
-
- public void setPodId(Long podId) {
- this.podId.setValue(podId);
- }
-
- public String getPodName() {
- return podName;
- }
-
- public void setPodName(String podName) {
- this.podName = podName;
- }
-
- public Long getClusterId() {
- return clusterId.getValue();
- }
-
- public void setClusterId(Long clusterId) {
- this.clusterId.setValue(clusterId);
- }
-
- public String getClusterName() {
- return clusterName;
- }
-
- public void setClusterName(String clusterName) {
- this.clusterName = clusterName;
- }
-
- public Long getCapacityUsed() {
- return capacityUsed;
- }
-
- public void setCapacityUsed(Long capacityUsed) {
- this.capacityUsed = capacityUsed;
- }
-
- public Long getCapacityTotal() {
- return capacityTotal;
- }
-
- public void setCapacityTotal(Long capacityTotal) {
- this.capacityTotal = capacityTotal;
- }
-
- public String getPercentUsed() {
- return percentUsed;
- }
-
- public void setPercentUsed(String percentUsed) {
- this.percentUsed = percentUsed;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 11d2b0b..0000000
--- a/api/src/com/cloud/api/response/CloudIdentifierResponse.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-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();
- }
-
- public void setUserId(Long userId) {
- this.userId.setValue(userId);
- }
-
- public String getCloudIdentifier() {
- return cloudIdentifier;
- }
-
- public void setCloudIdentifier(String cloudIdentifier) {
- this.cloudIdentifier = cloudIdentifier;
- }
-
- public String getSignature() {
- return signature;
- }
-
- public void setSignature(String signature) {
- this.signature = signature;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100755
index 329f1f0..0000000
--- a/api/src/com/cloud/api/response/ClusterResponse.java
+++ /dev/null
@@ -1,150 +0,0 @@
-// 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.response;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.CommandType;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class ClusterResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID) @Param(description="the cluster ID")
- private IdentityProxy id = new IdentityProxy("cluster");
-
- @SerializedName(ApiConstants.NAME) @Param(description="the cluster name")
- private String name;
-
- @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID of the cluster")
- private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
- @SerializedName("podname") @Param(description="the Pod name of the cluster")
- private String podName;
-
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the cluster")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the cluster")
- private String zoneName;
-
- @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();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Long getPodId() {
- return podId.getValue();
- }
-
- public void setPodId(Long podId) {
- this.podId.setValue(podId);
- }
-
- public String getPodName() {
- return podName;
- }
-
- public void setPodName(String podName) {
- this.podName = podName;
- }
-
- public Long getZoneId() {
- return zoneId.getValue();
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getClusterType() {
- return clusterType;
- }
-
- public void setClusterType(String clusterType) {
- this.clusterType = clusterType;
- }
-
- public String getHypervisorType() {
- return this.hypervisorType;
- }
-
- public void setHypervisorType(String hypervisorType) {
- this.hypervisorType = hypervisorType;
- }
-
- public String getAllocationState() {
- return allocationState;
- }
-
- public void setAllocationState(String allocationState) {
- this.allocationState = allocationState;
- }
-
- public String getManagedState() {
- return managedState;
- }
-
- public void setManagedState(String managedState) {
- this.managedState = managedState;
- }
-
- public List<CapacityResponse> getCapacitites() {
- return capacitites;
- }
-
- public void setCapacitites(ArrayList<CapacityResponse> arrayList) {
- this.capacitites = arrayList;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ConditionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ConditionResponse.java b/api/src/com/cloud/api/response/ConditionResponse.java
deleted file mode 100644
index a68e179..0000000
--- a/api/src/com/cloud/api/response/ConditionResponse.java
+++ /dev/null
@@ -1,117 +0,0 @@
-// 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.response;
-
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ConditionResponse extends BaseResponse implements ControlledEntityResponse {
- @SerializedName("id")
- @Param(description = "the id of the Condition")
- private final IdentityProxy id = new IdentityProxy("conditions");
-
- @SerializedName(value = ApiConstants.THRESHOLD)
- @Param(description = "Threshold Value for the counter.")
- private long threshold;
-
- @SerializedName(value = ApiConstants.RELATIONAL_OPERATOR)
- @Param(description = "Relational Operator to be used with threshold.")
- private String relationalOperator;
-
- @SerializedName("counter")
- @Param(description = "Details of the Counter.")
- private List<CounterResponse> counterResponse;
-
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "the domain id of the Condition owner")
- private final IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "the domain name of the owner.")
- private String domain;
-
- @SerializedName(ApiConstants.ZONE_ID)
- @Param(description = "zone id of counter")
- private final IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.PROJECT_ID)
- @Param(description = "the project id of the Condition.")
- private final IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT)
- @Param(description = "the project name of the Condition")
- private String projectName;
-
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the owner of the Condition.")
- private String accountName;
-
- // /////////////////////////////////////////////////
- // ///////////////// Setters ///////////////////////
- // ///////////////////////////////////////////////////
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setThreshold(long threshold) {
- this.threshold = threshold;
- }
-
- public void setRelationalOperator(String relationalOperator) {
- this.relationalOperator = relationalOperator;
- }
-
- public void setCounterResponse(List<CounterResponse> counterResponse) {
- this.counterResponse = counterResponse;
- }
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- @Override
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domain = domainName;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ConfigurationResponse.java b/api/src/com/cloud/api/response/ConfigurationResponse.java
deleted file mode 100644
index bcfac82..0000000
--- a/api/src/com/cloud/api/response/ConfigurationResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class ConfigurationResponse extends BaseResponse {
- @SerializedName(ApiConstants.CATEGORY) @Param(description="the category of the configuration")
- private String category;
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the configuration")
- private String name;
-
- @SerializedName(ApiConstants.VALUE) @Param(description="the value of the configuration")
- private String value;
-
- @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the configuration")
- private String description;
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index ab4a367..0000000
--- a/api/src/com/cloud/api/response/ControlledEntityResponse.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.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/c4c9d2d8/api/src/com/cloud/api/response/CounterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CounterResponse.java b/api/src/com/cloud/api/response/CounterResponse.java
deleted file mode 100644
index c005f13..0000000
--- a/api/src/com/cloud/api/response/CounterResponse.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class CounterResponse extends BaseResponse {
- @SerializedName("id")
- @Param(description = "the id of the Counter")
- private final IdentityProxy id = new IdentityProxy("counter");
-
- @SerializedName(value = ApiConstants.NAME)
- @Param(description = "Name of the counter.")
- private String name;
-
- @SerializedName(value = ApiConstants.SOURCE)
- @Param(description = "Source of the counter.")
- private String source;
-
- @SerializedName(value = ApiConstants.VALUE)
- @Param(description = "Value in case of snmp or other specific counters.")
- private String value;
-
- @SerializedName(ApiConstants.ZONE_ID)
- @Param(description = "zone id of counter")
- private final IdentityProxy zoneId = new IdentityProxy("data_center");
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setSource(String source) {
- this.source = source;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 5fa3b38..0000000
--- a/api/src/com/cloud/api/response/CreateCmdResponse.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-public class CreateCmdResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID)
- private IdentityProxy id = new IdentityProxy();
-
- public Long getId() {
- return id.getValue();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setIdEntityTable(String entityTable) {
- this.id.setTableName(entityTable);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/CustomCertificateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/CustomCertificateResponse.java b/api/src/com/cloud/api/response/CustomCertificateResponse.java
deleted file mode 100644
index 0738c33..0000000
--- a/api/src/com/cloud/api/response/CustomCertificateResponse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.response;
-
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class CustomCertificateResponse extends BaseResponse {
-
- @SerializedName("message") @Param(description="message of the certificate upload operation")
- private String message;
-
- public String getResultMessage() {
- return message;
- }
-
- public void setResultMessage(String msg) {
- this.message = msg;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 9b37431..0000000
--- a/api/src/com/cloud/api/response/DiskOfferingResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-// 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.response;
-
-import java.util.Date;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class DiskOfferingResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID) @Param(description="unique ID of the disk offering")
- private IdentityProxy id = new IdentityProxy("disk_offering");
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID this disk offering belongs to. Ignore this information as it is not currently applicable.")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name this disk offering belongs to. Ignore this information as it is not currently applicable.")
- private String domain;
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the disk offering")
- private String name;
-
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the disk offering.")
- private String displayText;
-
- @SerializedName(ApiConstants.DISK_SIZE) @Param(description="the size of the disk offering in GB")
- private Long diskSize;
-
- @SerializedName(ApiConstants.CREATED) @Param(description="the date this disk offering was created")
- private Date created;
-
- @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;
-
- @SerializedName("storagetype") @Param(description="the storage type for this disk offering")
- private String storageType;
-
- public Long getId() {
- return id.getValue();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public Long getDomainId() {
- return domainId.getValue();
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDisplayText() {
- return displayText;
- }
-
- public void setDisplayText(String displayText) {
- this.displayText = displayText;
- }
-
- public Long getDiskSize() {
- return diskSize;
- }
-
- public void setDiskSize(Long diskSize) {
- this.diskSize = diskSize;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getTags() {
- return tags;
- }
-
- public void setTags(String tags) {
- this.tags = tags;
- }
-
- public Boolean isCustomized() {
- return customized;
- }
-
- public void setCustomized(Boolean customized) {
- this.customized = customized;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
- public void setStorageType(String storageType) {
- this.storageType = storageType;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 52ba884..0000000
--- a/api/src/com/cloud/api/response/DomainResponse.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class DomainResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the domain")
- private IdentityProxy id = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the domain")
- private String domainName;
-
- @SerializedName(ApiConstants.LEVEL) @Param(description="the level of the domain")
- private Integer level;
-
- @SerializedName("parentdomainid") @Param(description="the domain ID of the parent domain")
- private IdentityProxy parentDomainId = new IdentityProxy("domain");
-
- @SerializedName("parentdomainname") @Param(description="the domain name of the parent domain")
- private String parentDomainName;
-
- @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();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public String getDomainName() {
- return domainName;
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public Integer getLevel() {
- return level;
- }
-
- public void setLevel(Integer level) {
- this.level = level;
- }
-
- public Long getParentDomainId() {
- return parentDomainId.getValue();
- }
-
- public void setParentDomainId(Long parentDomainId) {
- this.parentDomainId.setValue(parentDomainId);
- }
-
- public String getParentDomainName() {
- return parentDomainName;
- }
-
- public void setParentDomainName(String parentDomainName) {
- this.parentDomainName = parentDomainName;
- }
-
- public boolean getHasChild() {
- return hasChild;
- }
-
- public void setHasChild(boolean hasChild) {
- this.hasChild = hasChild;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index d710aad..0000000
--- a/api/src/com/cloud/api/response/DomainRouterResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// 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.response;
-
-import java.util.Date;
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.vm.VirtualMachine.State;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-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;
-
- @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the router")
- private String dns1;
-
- @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the router")
- private String dns2;
-
- @SerializedName("networkdomain") @Param(description="the network domain for the router")
- private String networkDomain;
-
- @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway for the router")
- private String gateway;
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the router")
- private String name;
-
- @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID for the router")
- private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
- @SerializedName(ApiConstants.HOST_ID) @Param(description="the host ID for the router")
- private IdentityProxy hostId = new IdentityProxy("host");
-
- @SerializedName("hostname") @Param(description="the hostname for the router")
- private String hostName;
-
- @SerializedName(ApiConstants.LINK_LOCAL_IP) @Param(description="the link local IP address for the router")
- private String linkLocalIp;
-
- @SerializedName(ApiConstants.LINK_LOCAL_MAC_ADDRESS) @Param(description="the link local MAC address for the router")
- private String linkLocalMacAddress;
-
- @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");
-
- @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public IP address for the router")
- private String publicIp;
-
- @SerializedName("publicmacaddress") @Param(description="the public MAC address for the router")
- private String publicMacAddress;
-
- @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");
-
- @SerializedName("guestipaddress") @Param(description="the guest IP address for the router")
- private String guestIpAddress;
-
- @SerializedName("guestmacaddress") @Param(description="the guest MAC address for the router")
- private String guestMacAddress;
-
- @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");
-
- @SerializedName(ApiConstants.TEMPLATE_ID) @Param(description="the template ID for the router")
- private IdentityProxy templateId = new IdentityProxy("vm_template");
-
- @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the router was created")
- private Date created;
-
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the router")
- private State state;
-
- @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;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID associated with the router")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @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",
- responseObject = NicResponse.class, since="4.0")
- private List<NicResponse> nics;
-
- @Override
- public Long getObjectId() {
- return getId();
- }
-
- public Long getId() {
- return id.getValue();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setPodId(Long podId) {
- this.podId.setValue(podId);
- }
-
- public void setHostId(Long hostId) {
- this.hostId.setValue(hostId);
- }
-
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public void setPublicMacAddress(String publicMacAddress) {
- this.publicMacAddress = publicMacAddress;
- }
-
- public void setPublicNetmask(String publicNetmask) {
- this.publicNetmask = publicNetmask;
- }
-
- public void setGuestIpAddress(String guestIpAddress) {
- this.guestIpAddress = guestIpAddress;
- }
-
- public void setGuestMacAddress(String guestMacAddress) {
- this.guestMacAddress = guestMacAddress;
- }
-
- public void setGuestNetmask(String guestNetmask) {
- this.guestNetmask = guestNetmask;
- }
-
- public void setTemplateId(Long templateId) {
- this.templateId.setValue(templateId);
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setPublicNetworkId(Long publicNetworkId) {
- this.publicNetworkId.setValue(publicNetworkId);
- }
-
- public void setGuestNetworkId(Long guestNetworkId) {
- this.guestNetworkId.setValue(guestNetworkId);
- }
-
- public void setLinkLocalIp(String linkLocalIp) {
- this.linkLocalIp = linkLocalIp;
- }
-
- public void setLinkLocalMacAddress(String linkLocalMacAddress) {
- this.linkLocalMacAddress = linkLocalMacAddress;
- }
-
- public void setLinkLocalNetmask(String linkLocalNetmask) {
- this.linkLocalNetmask = linkLocalNetmask;
- }
-
- public void setLinkLocalNetworkId(Long linkLocalNetworkId) {
- this.linkLocalNetworkId.setValue(linkLocalNetworkId);
- }
-
- public void setServiceOfferingId(Long serviceOfferingId) {
- this.serviceOfferingId.setValue(serviceOfferingId);
- }
-
- public void setServiceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- }
-
- public void setRedundantState(String redundantState) {
- this.redundantState = redundantState;
- }
-
- public void setIsRedundantRouter(boolean isRedundantRouter) {
- this.isRedundantRouter = isRedundantRouter;
- }
-
- 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;
- }
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- 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/c4c9d2d8/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
deleted file mode 100644
index 6129221..0000000
--- a/api/src/com/cloud/api/response/EventResponse.java
+++ /dev/null
@@ -1,124 +0,0 @@
-// 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.response;
-
-import java.util.Date;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.event.Event;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class EventResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the event")
- private IdentityProxy id = new IdentityProxy("event");
-
- @SerializedName(ApiConstants.USERNAME) @Param(description="the name of the user who performed the action (can be different from the account if an admin is performing an action for a user, e.g. starting/stopping a user's virtual machine)")
- private String username;
-
- @SerializedName(ApiConstants.TYPE) @Param(description="the type of the event (see event types)")
- private String eventType;
-
- @SerializedName(ApiConstants.LEVEL) @Param(description="the event level (INFO, WARN, ERROR)")
- private String level;
-
- @SerializedName(ApiConstants.DESCRIPTION) @Param(description="a brief description of the event")
- private String description;
-
- @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;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the id of the account's domain")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the account's domain")
- private String domainName;
-
- @SerializedName(ApiConstants.CREATED) @Param(description="the date the event was created")
- private Date created;
-
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the event")
- private Event.State state;
-
- @SerializedName("parentid") @Param(description="whether the event is parented")
- private IdentityProxy parentId = new IdentityProxy("event");
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public void setEventType(String eventType) {
- this.eventType = eventType;
- }
-
- public void setLevel(String level) {
- this.level = level;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public void setState(Event.State state) {
- this.state = state;
- }
-
- public void setParentId(Long parentId) {
- this.parentId.setValue(parentId);
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/EventTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/EventTypeResponse.java b/api/src/com/cloud/api/response/EventTypeResponse.java
deleted file mode 100644
index 9f6f84f..0000000
--- a/api/src/com/cloud/api/response/EventTypeResponse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class EventTypeResponse extends BaseResponse {
- @SerializedName(ApiConstants.NAME) @Param(description="Event Type")
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index 9ff2cf1..0000000
--- a/api/src/com/cloud/api/response/ExceptionResponse.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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.response;
-
-import java.util.ArrayList;
-
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-public class ExceptionResponse extends BaseResponse {
-
- @SerializedName("uuidList") @Param(description="List of uuids associated with this error")
- private ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
-
- @SerializedName("errorcode") @Param(description="numeric code associated with this error")
- private Integer errorCode;
-
- @SerializedName("cserrorcode") @Param(description="cloudstack exception error code associated with this error")
- private Integer csErrorCode;
-
- @SerializedName("errortext") @Param(description="the text associated with this error")
- private String errorText = "Command failed due to Internal Server Error";
-
- public Integer getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(Integer errorCode) {
- this.errorCode = errorCode;
- }
-
- public String getErrorText() {
- return errorText;
- }
-
- public void setErrorText(String errorText) {
- this.errorText = errorText;
- }
-
- public void addProxyObject(String tableName, Long id, String idFieldName) {
- idList.add(new IdentityProxy(tableName, id, idFieldName));
- return;
- }
-
- public ArrayList<IdentityProxy> getIdProxyList() {
- return idList;
- }
-
- public void setCSErrorCode(int cserrcode) {
- this.csErrorCode = cserrcode;
- }
-
- @Override
- public String toString() {
- return ("Error Code: " + errorCode + " Error text: " + errorText);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100755
index b285b45..0000000
--- a/api/src/com/cloud/api/response/ExtractResponse.java
+++ /dev/null
@@ -1,207 +0,0 @@
-// 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.response;
-
-import java.util.Date;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-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");
-
- @SerializedName("resultstring") @Param(includeInApiDoc=false)
- 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");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="zone name the object was extracted from")
- private String zoneName;
-
- @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(){
- }
-
- 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);
- }
-
- public Long getId() {
- return id.getValue();
- }
-
- public void setId(long id) {
- this.id.setValue(id);
- }
-
- public void setIdentityTableName(String tableName) {
- this.id.setTableName(tableName);
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Long getUploadId() {
- return uploadId.getValue();
- }
-
- public void setUploadId(Long uploadId) {
- this.uploadId.setValue(uploadId);
- }
-
- public Integer getUploadPercent() {
- return uploadPercent;
- }
-
- public void setUploadPercent(int uploadPercent) {
- this.uploadPercent = uploadPercent;
- }
-
- public String getUploadStatus() {
- return status;
- }
-
- public void setUploadStatus(String status) {
- this.status = status;
- }
-
- public Long getAccountId() {
- return accountId.getValue();
- }
-
- public void setAccountId(long accountId) {
- this.accountId.setValue(accountId);
- }
-
- public String getResultString() {
- return resultString;
- }
-
- public void setResultString(String resultString) {
- this.resultString = resultString;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
- public void setStorageType(String storageType) {
- this.storageType = storageType;
- }
-
- public String getStorage() {
- return storage;
- }
-
- public void setStorage(String storage) {
- this.storage = storage;
- }
-
- public Long getZoneId() {
- return zoneId.getValue();
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public String getMode() {
- return mode;
- }
-
- public void setMode(String mode) {
- this.mode = mode;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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
deleted file mode 100644
index bcb78e2..0000000
--- a/api/src/com/cloud/api/response/FirewallResponse.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// 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.response;
-
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class FirewallResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the firewall rule")
- private IdentityProxy id = new IdentityProxy("firewall_rules");
-
- @SerializedName(ApiConstants.PROTOCOL) @Param(description="the protocol of the firewall rule")
- private String protocol;
-
- @SerializedName(ApiConstants.START_PORT) @Param(description="the starting port of firewall rule's port range")
- private String startPort;
-
- @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;
-
- @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 rule", responseObject = ResourceTagResponse.class)
- private List<ResourceTagResponse> tags;
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public void setStartPort(String startPort) {
- this.startPort = startPort;
- }
-
- public void setEndPort(String endPort) {
- this.endPort = endPort;
- }
-
- public void setPublicIpAddressId(Long publicIpAddressId) {
- this.publicIpAddressId = publicIpAddressId;
- }
-
- public void setPublicIpAddress(String publicIpAddress) {
- this.publicIpAddress = publicIpAddress;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public void setCidrList(String cidrList) {
- this.cidrList = cidrList;
- }
-
- public void setIcmpType(Integer icmpType) {
- this.icmpType = icmpType;
- }
-
- public void setIcmpCode(Integer icmpCode) {
- this.icmpCode = icmpCode;
- }
-
- public void setTags(List<ResourceTagResponse> tags) {
- this.tags = tags;
- }
-}