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
[26/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/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkResponse.java b/api/src/com/cloud/api/response/NetworkResponse.java
deleted file mode 100644
index 0917cfa..0000000
--- a/api/src/com/cloud/api/response/NetworkResponse.java
+++ /dev/null
@@ -1,296 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class NetworkResponse extends BaseResponse implements ControlledEntityResponse{
-
- @SerializedName(ApiConstants.ID) @Param(description="the id of the network")
- private IdentityProxy id = new IdentityProxy("networks");
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the network")
- private String name;
-
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the displaytext of the network")
- private String displaytext;
-
- @SerializedName("broadcastdomaintype") @Param(description="Broadcast domain type of the network")
- private String broadcastDomainType;
-
- @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type of the network")
- private String trafficType;
-
- @SerializedName(ApiConstants.GATEWAY) @Param(description="the network's gateway")
- private String gateway;
-
- @SerializedName(ApiConstants.NETMASK) @Param(description="the network's netmask")
- private String netmask;
-
- @SerializedName(ApiConstants.CIDR) @Param(description="the cidr the network")
- private String cidr;
-
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the network")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the network belongs to")
- private String zoneName;
-
- @SerializedName("networkofferingid") @Param(description="network offering id the network is created from")
- private IdentityProxy networkOfferingId = new IdentityProxy("network_offerings");
-
- @SerializedName("networkofferingname") @Param(description="name of the network offering the network is created from")
- private String networkOfferingName;
-
- @SerializedName("networkofferingdisplaytext") @Param(description="display text of the network offering the network is created from")
- private String networkOfferingDisplayText;
-
- @SerializedName("networkofferingavailability") @Param(description="availability of the network offering the network is created from")
- private String networkOfferingAvailability;
-
- @SerializedName(ApiConstants.IS_SYSTEM) @Param(description="true if network is system, false otherwise")
- private Boolean isSystem;
-
- @SerializedName(ApiConstants.STATE) @Param(description="state of the network")
- private String state;
-
- @SerializedName("related") @Param(description="related to what other network configuration")
- private IdentityProxy related = new IdentityProxy("networks");
-
- @SerializedName("broadcasturi") @Param(description="broadcast uri of the network. This parameter is visible to ROOT admins only")
- private String broadcastUri;
-
- @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the network")
- private String dns1;
-
- @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the network")
- private String dns2;
-
- @SerializedName(ApiConstants.TYPE) @Param(description="the type of the network")
- private String type;
-
- @SerializedName(ApiConstants.VLAN) @Param(description="The vlan of the network. This parameter is visible to ROOT admins only")
- private String vlan;
-
- @SerializedName(ApiConstants.ACL_TYPE) @Param(description="acl type - access type to the network")
- private String aclType;
-
- @SerializedName(ApiConstants.SUBDOMAIN_ACCESS) @Param(description="true if users from subdomains can access the domain level network")
- private Boolean subdomainAccess;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the network")
- 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 of the network owner")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the network owner")
- private String domain;
-
- @SerializedName("isdefault") @Param(description="true if network is default, false otherwise")
- private Boolean isDefault;
-
- @SerializedName("service") @Param(description="the list of services", responseObject = ServiceResponse.class)
- private List<ServiceResponse> services;
-
- @SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain")
- private String networkDomain;
-
- @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network id")
- private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
- @SerializedName(ApiConstants.RESTART_REQUIRED) @Param(description="true network requires restart")
- private Boolean restartRequired;
-
- @SerializedName(ApiConstants.SPECIFY_IP_RANGES) @Param(description="true if network supports specifying ip ranges, false otherwise")
- private Boolean specifyIpRanges;
-
- @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the network belongs to")
- private IdentityProxy vpcId = new IdentityProxy("vpc");
-
- @SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY) @Param(description="list networks available for vm deployment")
- private Boolean canUseForDeploy;
-
- @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with network", responseObject = ResourceTagResponse.class)
- private List<ResourceTagResponse> tags;
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setBroadcastDomainType(String broadcastDomainType) {
- this.broadcastDomainType = broadcastDomainType;
- }
-
- public void setTrafficType(String trafficType) {
- this.trafficType = trafficType;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setNetmask(String netmask) {
- this.netmask = netmask;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public void setNetworkOfferingId(Long networkOfferingId) {
- this.networkOfferingId.setValue(networkOfferingId);
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public void setRelated(Long related) {
- this.related.setValue(related);
- }
-
- public void setBroadcastUri(String broadcastUri) {
- this.broadcastUri = broadcastUri;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setNetworkOfferingName(String networkOfferingName) {
- this.networkOfferingName = networkOfferingName;
- }
-
- public void setNetworkOfferingDisplayText(String networkOfferingDisplayText) {
- this.networkOfferingDisplayText = networkOfferingDisplayText;
- }
-
- public void setDisplaytext(String displaytext) {
- this.displaytext = displaytext;
- }
-
- public void setVlan(String vlan) {
- this.vlan = vlan;
- }
-
- public void setIsSystem(Boolean isSystem) {
- this.isSystem = isSystem;
- }
-
- public void setDomainName(String domain) {
- this.domain = domain;
- }
-
- public void setNetworkOfferingAvailability(String networkOfferingAvailability) {
- this.networkOfferingAvailability = networkOfferingAvailability;
- }
-
- public void setServices(List<ServiceResponse> services) {
- this.services = services;
- }
-
- public void setIsDefault(Boolean isDefault) {
- this.isDefault = isDefault;
- }
-
- public void setNetworkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public void setPhysicalNetworkId(Long physicalNetworkId) {
- this.physicalNetworkId.setValue(physicalNetworkId);
- }
-
- public void setAclType(String aclType) {
- this.aclType = aclType;
- }
-
- public void setSubdomainAccess(Boolean subdomainAccess) {
- this.subdomainAccess = subdomainAccess;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public void setCidr(String cidr) {
- this.cidr = cidr;
- }
-
- public void setRestartRequired(Boolean restartRequired) {
- this.restartRequired = restartRequired;
- }
-
- public void setSpecifyIpRanges(Boolean specifyIpRanges) {
- this.specifyIpRanges = specifyIpRanges;
- }
-
- public void setVpcId(Long vpcId) {
- this.vpcId.setValue(vpcId);
- }
-
- public void setCanUseForDeploy(Boolean canUseForDeploy) {
- this.canUseForDeploy = canUseForDeploy;
- }
-
- public void setTags(List<ResourceTagResponse> tags) {
- this.tags = tags;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/NicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NicResponse.java b/api/src/com/cloud/api/response/NicResponse.java
deleted file mode 100755
index 69d5c31..0000000
--- a/api/src/com/cloud/api/response/NicResponse.java
+++ /dev/null
@@ -1,140 +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;
-
-@SuppressWarnings("unused")
-public class NicResponse extends BaseResponse {
-
- @SerializedName("id") @Param(description="the ID of the nic")
- private final IdentityProxy id = new IdentityProxy("nics");
-
- @SerializedName("networkid") @Param(description="the ID of the corresponding network")
- private final IdentityProxy networkId = new IdentityProxy("networks");
-
- @SerializedName("networkname") @Param(description="the name of the corresponding network")
- private String networkName ;
-
- @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the nic")
- private String netmask;
-
- @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the nic")
- private String gateway;
-
- @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the ip address of the nic")
- private String ipaddress;
-
- @SerializedName("isolationuri") @Param(description="the isolation uri of the nic")
- private String isolationUri;
-
- @SerializedName("broadcasturi") @Param(description="the broadcast uri of the nic")
- private String broadcastUri;
-
- @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type of the nic")
- private String trafficType;
-
- @SerializedName(ApiConstants.TYPE) @Param(description="the type of the nic")
- private String type;
-
- @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if nic is default, false otherwise")
- private Boolean isDefault;
-
- @SerializedName("macaddress") @Param(description="true if nic is default, false otherwise")
- private String macAddress;
-
- public Long getId() {
- return id.getValue();
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setNetworkid(Long networkid) {
- this.networkId.setValue(networkid);
- }
-
- public void setNetworkName(String networkname) {
- this.networkName = networkname;
- }
-
- public void setNetmask(String netmask) {
- this.netmask = netmask;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setIpaddress(String ipaddress) {
- this.ipaddress = ipaddress;
- }
-
- public void setIsolationUri(String isolationUri) {
- this.isolationUri = isolationUri;
- }
-
- public void setBroadcastUri(String broadcastUri) {
- this.broadcastUri = broadcastUri;
- }
-
- public void setTrafficType(String trafficType) {
- this.trafficType = trafficType;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public void setIsDefault(Boolean isDefault) {
- this.isDefault = isDefault;
- }
-
- public void setMacAddress(String macAddress) {
- this.macAddress = macAddress;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- NicResponse other = (NicResponse) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java b/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
deleted file mode 100644
index 72f1075..0000000
--- a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
+++ /dev/null
@@ -1,118 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class PhysicalNetworkResponse extends BaseResponse{
-
- @SerializedName(ApiConstants.ID) @Param(description="the uuid of the physical network")
- private String id;
-
- @SerializedName(ApiConstants.NAME) @Param(description="name of the physical network")
- private String name;
-
- @SerializedName(ApiConstants.BROADCAST_DOMAIN_RANGE) @Param(description="Broadcast domain range of the physical network")
- private String broadcastDomainRange;
-
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the physical network")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.STATE) @Param(description="state of the physical network")
- private String state;
-
- @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the physical network")
- private String vlan;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the physical network owner")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.TAGS) @Param(description="comma separated tag")
- private String tags;
-
- @SerializedName(ApiConstants.ISOLATION_METHODS) @Param(description="isolation methods")
- private String isolationMethods;
-
- @SerializedName(ApiConstants.NETWORK_SPEED) @Param(description="the speed of the physical network")
- private String networkSpeed;
-
- public void setId(String uuid) {
- this.id = uuid;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setVlan(String vlan) {
- this.vlan = vlan;
- }
-
-
- public void setTags(List<String> tags) {
- if (tags == null || tags.size() == 0) {
- return;
- }
-
- StringBuilder buf = new StringBuilder();
- for (String tag : tags) {
- buf.append(tag).append(",");
- }
-
- this.tags = buf.delete(buf.length()-1, buf.length()).toString();
- }
-
- public void setBroadcastDomainRange(String broadcastDomainRange) {
- this.broadcastDomainRange = broadcastDomainRange;
- }
-
- public void setNetworkSpeed(String networkSpeed) {
- this.networkSpeed = networkSpeed;
- }
-
- public void setIsolationMethods(List<String> isolationMethods) {
- if (isolationMethods == null || isolationMethods.size() == 0) {
- return;
- }
-
- StringBuilder buf = new StringBuilder();
- for (String isolationMethod : isolationMethods) {
- buf.append(isolationMethod).append(",");
- }
-
- this.isolationMethods = buf.delete(buf.length()-1, buf.length()).toString();
- }
-
- 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/PodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PodResponse.java b/api/src/com/cloud/api/response/PodResponse.java
deleted file mode 100755
index df4a70f..0000000
--- a/api/src/com/cloud/api/response/PodResponse.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.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class PodResponse extends BaseResponse {
- @SerializedName("id") @Param(description="the ID of the Pod")
- private IdentityProxy id = new IdentityProxy("host_pod_ref");
-
- @SerializedName("name") @Param(description="the name of the Pod")
- private String name;
-
- @SerializedName("zoneid") @Param(description="the Zone ID of the Pod")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the Pod")
- private String zoneName;
-
- @SerializedName("gateway") @Param(description="the gateway of the Pod")
- private String gateway;
-
- @SerializedName("netmask") @Param(description="the netmask of the Pod")
- private String netmask;
-
- @SerializedName("startip") @Param(description="the starting IP for the Pod")
- private String startIp;
-
- @SerializedName("endip") @Param(description="the ending IP for the Pod")
- private String endIp;
-
- @SerializedName("allocationstate") @Param(description="the allocation state of the Pod")
- private String allocationState;
-
- @SerializedName("capacity") @Param(description="the capacity of the Pod", 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 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 getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public String getNetmask() {
- return netmask;
- }
-
- public void setNetmask(String netmask) {
- this.netmask = netmask;
- }
-
- public String getStartIp() {
- return startIp;
- }
-
- public void setStartIp(String startIp) {
- this.startIp = startIp;
- }
-
- public String getEndIp() {
- return endIp;
- }
-
- public void setEndIp(String endIp) {
- this.endIp = endIp;
- }
-
- public String getAllocationState() {
- return allocationState;
- }
-
- public void setAllocationState(String allocationState) {
- this.allocationState = allocationState;
- }
-
- public List<CapacityResponse> getCapacitites() {
- return capacitites;
- }
-
- public void setCapacitites(List<CapacityResponse> capacitites) {
- this.capacitites = capacitites;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PrivateGatewayResponse.java b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
deleted file mode 100644
index e901a70..0000000
--- a/api/src/com/cloud/api/response/PrivateGatewayResponse.java
+++ /dev/null
@@ -1,140 +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 PrivateGatewayResponse extends BaseResponse implements ControlledEntityResponse{
-
- @SerializedName(ApiConstants.ID) @Param(description="the id of the private gateway")
- private IdentityProxy id = new IdentityProxy("vpc_gateways");
-
- @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway")
- private String gateway;
-
- @SerializedName(ApiConstants.NETMASK) @Param(description="the private gateway's netmask")
- private String netmask;
-
- @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the private gateway's ip address")
- private String address;
-
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the private gateway")
- private IdentityProxy zoneId = new IdentityProxy("data_center");
-
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the private gateway belongs to")
- private String zoneName;
-
- @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the private gateway")
- private String vlan;
-
- @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the private gateaway belongs to")
- private IdentityProxy vpcId = new IdentityProxy("vpc");
-
- @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network id")
- private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the account associated with the private gateway")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the private gateway")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the private gateway")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "the ID of the domain associated with the private gateway")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "the domain associated with the private gateway")
- private String domainName;
-
- @SerializedName(ApiConstants.STATE) @Param(description="State of the gateway, can be Creating, Ready, Deleting")
- private String state;
-
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public void setNetmask(String netmask) {
- this.netmask = netmask;
- }
-
- public void setZoneId(Long zoneId) {
- this.zoneId.setValue(zoneId);
- }
-
- public void setVlan(String vlan) {
- this.vlan = vlan;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public void setVpcId(Long vpcId) {
- this.vpcId.setValue(vpcId);
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public void setPhysicalNetworkId(Long physicalNetworkId) {
- this.physicalNetworkId.setValue(physicalNetworkId);
- }
-
- @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 setState(String state) {
- this.state = state;
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ProjectAccountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectAccountResponse.java b/api/src/com/cloud/api/response/ProjectAccountResponse.java
deleted file mode 100644
index e613466..0000000
--- a/api/src/com/cloud/api/response/ProjectAccountResponse.java
+++ /dev/null
@@ -1,99 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ProjectAccountResponse extends BaseResponse implements ControlledEntityResponse {
- @SerializedName(ApiConstants.PROJECT_ID)
- @Param(description = "project id")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT)
- @Param(description = "project name")
- private String projectName;
-
- @SerializedName(ApiConstants.ACCOUNT_ID)
- @Param(description = "the id of the account")
- private IdentityProxy id = new IdentityProxy("account");
-
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the name of the account")
- private String accountName;
-
- @SerializedName(ApiConstants.ACCOUNT_TYPE)
- @Param(description = "account type (admin, domain-admin, user)")
- private Short accountType;
-
- @SerializedName(ApiConstants.ROLE)
- @Param(description = "account role in the project (regular,owner)")
- private String role;
-
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "id of the Domain the account belongs too")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "name of the Domain the account belongs too")
- private String domainName;
-
- @SerializedName(ApiConstants.USER)
- @Param(description = "the list of users associated with account", responseObject = UserResponse.class)
- private List<UserResponse> users;
-
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setAccountType(Short accountType) {
- this.accountType = accountType;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setUsers(List<UserResponse> users) {
- this.users = users;
- }
-
- public void setRole(String role) {
- this.role = role;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ProjectInvitationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectInvitationResponse.java b/api/src/com/cloud/api/response/ProjectInvitationResponse.java
deleted file mode 100644
index abb47a7..0000000
--- a/api/src/com/cloud/api/response/ProjectInvitationResponse.java
+++ /dev/null
@@ -1,81 +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;
-
-@SuppressWarnings("unused")
-public class ProjectInvitationResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ID) @Param(description="the id of the invitation")
- private IdentityProxy id = new IdentityProxy("project_invitations");
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the id of the project")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the name of the project")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
- private String domainName;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
- private String accountName;
-
- @SerializedName(ApiConstants.EMAIL) @Param(description="the email the invitation was sent to")
- private String email;
-
- @SerializedName(ApiConstants.STATE) @Param(description="the invitation state")
- private String invitationState;
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setDomainName(String domain) {
- this.domainName = domain;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setInvitationState(String invitationState) {
- this.invitationState = invitationState;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ProjectResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectResponse.java b/api/src/com/cloud/api/response/ProjectResponse.java
deleted file mode 100644
index 2735980..0000000
--- a/api/src/com/cloud/api/response/ProjectResponse.java
+++ /dev/null
@@ -1,85 +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 ProjectResponse extends BaseResponse{
-
- @SerializedName(ApiConstants.ID) @Param(description="the id of the project")
- private IdentityProxy id = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the project")
- private String name;
-
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the displaytext of the project")
- private String displaytext;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
- private String domain;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
- private String ownerName;
-
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the project")
- private String state;
-
- @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
- private List<ResourceTagResponse> tags;
-
-
- public void setId(Long id) {
- this.id.setValue(id);
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setDisplaytext(String displaytext) {
- this.displaytext = displaytext;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public void setOwner(String owner) {
- this.ownerName = owner;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public void setTags(List<ResourceTagResponse> tags) {
- this.tags = tags;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProviderResponse.java b/api/src/com/cloud/api/response/ProviderResponse.java
deleted file mode 100644
index d8a5eb6..0000000
--- a/api/src/com/cloud/api/response/ProviderResponse.java
+++ /dev/null
@@ -1,105 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class ProviderResponse extends BaseResponse {
-
- @SerializedName(ApiConstants.NAME) @Param(description="the provider name")
- private String name;
-
- @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
- private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
- @SerializedName(ApiConstants.DEST_PHYSICAL_NETWORK_ID) @Param(description="the destination physical network")
- private IdentityProxy destinationPhysicalNetworkId = new IdentityProxy("physical_network");
-
- @SerializedName(ApiConstants.STATE) @Param(description="state of the network provider")
- private String state;
-
- @SerializedName(ApiConstants.ID) @Param(description="uuid of the network provider")
- private String id;
-
- @SerializedName(ApiConstants.SERVICE_LIST) @Param(description="services for this provider")
- private List<String> services;
-
- @SerializedName(ApiConstants.CAN_ENABLE_INDIVIDUAL_SERVICE) @Param(description="true if individual services can be enabled/disabled")
- private Boolean canEnableIndividualServices;
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setPhysicalNetworkId(long physicalNetworkId) {
- this.physicalNetworkId.setValue(physicalNetworkId);
- }
-
- public long getphysicalNetworkId() {
- return physicalNetworkId.getValue();
- }
-
- public void setDestinationPhysicalNetworkId(long destPhysicalNetworkId) {
- this.destinationPhysicalNetworkId.setValue(destPhysicalNetworkId);
- }
-
- public long getDestinationPhysicalNetworkId() {
- return destinationPhysicalNetworkId.getValue();
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getState() {
- return this.state;
- }
-
- public void setId(String uuid) {
- this.id = uuid;
- }
-
- public String getId() {
- return this.id;
- }
-
- public void setServices(List<String> services) {
- this.services = services;
- }
-
- public List<String> getServices() {
- return services;
- }
-
- public Boolean getCanEnableIndividualServices() {
- return canEnableIndividualServices;
- }
-
- public void setCanEnableIndividualServices(Boolean canEnableIndividualServices) {
- this.canEnableIndividualServices = canEnableIndividualServices;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/RegisterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/RegisterResponse.java b/api/src/com/cloud/api/response/RegisterResponse.java
deleted file mode 100644
index 6f9f340..0000000
--- a/api/src/com/cloud/api/response/RegisterResponse.java
+++ /dev/null
@@ -1,44 +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 RegisterResponse extends BaseResponse {
- @SerializedName("apikey") @Param(description="the api key of the registered user")
- private String apiKey;
-
- @SerializedName("secretkey") @Param(description="the secret key of the registered user")
- private String secretKey;
-
- public String getApiKey() {
- return apiKey;
- }
-
- public void setApiKey(String apiKey) {
- this.apiKey = apiKey;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java b/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
deleted file mode 100644
index c6fe4d4..0000000
--- a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
+++ /dev/null
@@ -1,99 +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;
-
-@SuppressWarnings("unused")
-public class RemoteAccessVpnResponse extends BaseResponse implements ControlledEntityResponse{
-
- @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="the public ip address of the vpn server")
- private IdentityProxy publicIpId = new IdentityProxy("user_ip_address");
-
- @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public ip address of the vpn server")
- private String publicIp;
-
- @SerializedName("iprange") @Param(description="the range of ips to allocate to the clients")
- private String ipRange;
-
- @SerializedName("presharedkey") @Param(description="the ipsec preshared key")
- private String presharedKey;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the remote access vpn")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the account of the remote access vpn")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn")
- private String domainName;
-
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
- private String state;
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public void setIpRange(String ipRange) {
- this.ipRange = ipRange;
- }
-
- public void setPresharedKey(String presharedKey) {
- this.presharedKey = presharedKey;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setDomainName(String name) {
- this.domainName = name;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public void setPublicIpId(Long publicIpId) {
- this.publicIpId.setValue(publicIpId);
- }
-
- @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/ResourceCountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceCountResponse.java b/api/src/com/cloud/api/response/ResourceCountResponse.java
deleted file mode 100644
index 73fe44f..0000000
--- a/api/src/com/cloud/api/response/ResourceCountResponse.java
+++ /dev/null
@@ -1,81 +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;
-
-@SuppressWarnings("unused")
-public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account for which resource count's are updated")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id for which resource count's are updated")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name for which resource count's are updated")
- private String projectName;
-
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID for which resource count's are updated")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name for which resource count's are updated")
- private String domainName;
-
- @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type. Values include 0, 1, 2, 3, 4. See the resourceType parameter for more information on these values.")
- private String resourceType;
-
- @SerializedName("resourcecount") @Param(description="resource count")
- private long resourceCount;
-
- @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 setResourceType(String resourceType) {
- this.resourceType = resourceType;
- }
-
- public void setResourceCount(Long resourceCount) {
- this.resourceCount = resourceCount;
- }
-
- @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/ResourceLimitResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceLimitResponse.java b/api/src/com/cloud/api/response/ResourceLimitResponse.java
deleted file mode 100644
index f41feca..0000000
--- a/api/src/com/cloud/api/response/ResourceLimitResponse.java
+++ /dev/null
@@ -1,79 +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;
-
-@SuppressWarnings("unused")
-public class ResourceLimitResponse extends BaseResponse implements ControlledEntityResponse {
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the resource limit")
- private String accountName;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the resource limit")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the resource limit")
- private String domainName;
-
- @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type. Values include 0, 1, 2, 3, 4. See the resourceType parameter for more information on these values.")
- private String resourceType;
-
- @SerializedName("max") @Param(description="the maximum number of the resource. A -1 means the resource currently has no limit.")
- private Long max;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the resource limit")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the resource limit")
- private String projectName;
-
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @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.domainName = domainName;
- }
-
- public void setResourceType(String resourceType) {
- this.resourceType = resourceType;
- }
-
- public void setMax(Long max) {
- this.max = max;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceTagResponse.java b/api/src/com/cloud/api/response/ResourceTagResponse.java
deleted file mode 100644
index 13566a7..0000000
--- a/api/src/com/cloud/api/response/ResourceTagResponse.java
+++ /dev/null
@@ -1,100 +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 ResourceTagResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.KEY) @Param(description="tag key name")
- private String key;
-
- @SerializedName(ApiConstants.VALUE) @Param(description="tag value")
- private String value;
-
- @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type")
- private String resourceType;
-
- @SerializedName(ApiConstants.RESOURCE_ID) @Param(description="id of the resource")
- private String id;
-
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the account associated with the tag")
- private String accountName;
-
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id the tag belongs to")
- private IdentityProxy projectId = new IdentityProxy("projects");
-
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name where tag belongs to")
- private String projectName;
-
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "the ID of the domain associated with the tag")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "the domain associated with the tag")
- private String domainName;
-
- @SerializedName(ApiConstants.CUSTOMER) @Param(description="customer associated with the tag")
- private String customer;
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public void setResourceType(String resourceType) {
- this.resourceType = resourceType;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- 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 setCustomer(String customer) {
- this.customer = customer;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/S3Response.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/S3Response.java b/api/src/com/cloud/api/response/S3Response.java
deleted file mode 100644
index 1efbe23..0000000
--- a/api/src/com/cloud/api/response/S3Response.java
+++ /dev/null
@@ -1,209 +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.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-import static com.cloud.api.ApiConstants.*;
-
-public class S3Response extends BaseResponse {
-
- @SerializedName(ID)
- @Param(description = "The ID of the S3 configuration")
- private IdentityProxy id = new IdentityProxy("s3");
-
- @SerializedName(S3_ACCESS_KEY)
- @Param(description = "The S3 access key")
- private String accessKey;
-
- @SerializedName(S3_SECRET_KEY)
- @Param(description = "The S3 secret key")
- private String secretKey;
-
- @SerializedName(S3_END_POINT)
- @Param(description = "The S3 end point")
- private String endPoint;
-
- @SerializedName(S3_BUCKET_NAME)
- @Param(description = "The name of the template storage bucket")
- private String bucketName;
-
- @SerializedName(S3_HTTPS_FLAG)
- @Param(description = "Connect to S3 using HTTPS?")
- private Integer httpsFlag;
-
- @SerializedName(S3_CONNECTION_TIMEOUT)
- @Param(description = "The connection timeout (milliseconds)")
- private Integer connectionTimeout;
-
- @SerializedName(S3_MAX_ERROR_RETRY)
- @Param(description = "The maximum number of time to retry a connection on error.")
- private Integer maxErrorRetry;
-
- @SerializedName(S3_SOCKET_TIMEOUT)
- @Param(description = "The connection socket (milliseconds)")
- private Integer socketTimeout;
-
- @Override
- public boolean equals(final Object thatObject) {
-
- if (this == thatObject) {
- return true;
- }
-
- if (thatObject == null || this.getClass() != thatObject.getClass()) {
- return false;
- }
-
- final S3Response thatS3Response = (S3Response) thatObject;
-
- if (this.httpsFlag != null ? !this.httpsFlag.equals(thatS3Response.httpsFlag) : thatS3Response.httpsFlag != null) {
- return false;
- }
-
- if (this.accessKey != null ? !this.accessKey.equals(thatS3Response.accessKey) : thatS3Response.accessKey != null) {
- return false;
- }
-
- if (this.connectionTimeout != null ? !this.connectionTimeout.equals(thatS3Response.connectionTimeout) : thatS3Response.connectionTimeout != null) {
- return false;
- }
-
- if (this.endPoint != null ? !this.endPoint.equals(thatS3Response.endPoint) : thatS3Response.endPoint != null) {
- return false;
- }
-
- if (this.id != null ? !this.id.equals(thatS3Response.id) : thatS3Response.id != null) {
- return false;
- }
-
- if (this.maxErrorRetry != null ? !this.maxErrorRetry.equals(thatS3Response.maxErrorRetry) : thatS3Response.maxErrorRetry != null) {
- return false;
- }
-
- if (this.secretKey != null ? !this.secretKey.equals(thatS3Response.secretKey) : thatS3Response.secretKey != null) {
- return false;
- }
-
- if (this.socketTimeout != null ? !this.socketTimeout.equals(thatS3Response.socketTimeout) : thatS3Response.socketTimeout != null) {
- return false;
- }
-
- if (this.bucketName != null ? !this.bucketName.equals(thatS3Response.bucketName) : thatS3Response.bucketName != null) {
- return false;
- }
-
- return true;
-
- }
-
- @Override
- public int hashCode() {
-
- int result = this.id != null ? this.id.hashCode() : 0;
- result = 31 * result + (this.accessKey != null ? this.accessKey.hashCode() : 0);
- result = 31 * result + (this.secretKey != null ? this.secretKey.hashCode() : 0);
- result = 31 * result + (this.endPoint != null ? this.endPoint.hashCode() : 0);
- result = 31 * result + (this.bucketName != null ? this.bucketName.hashCode() : 0);
- result = 31 * result + (this.httpsFlag != null ? this.httpsFlag : 0);
- result = 31 * result + (this.connectionTimeout != null ? this.connectionTimeout.hashCode() : 0);
- result = 31 * result + (this.maxErrorRetry != null ? this.maxErrorRetry.hashCode() : 0);
- result = 31 * result + (this.socketTimeout != null ? this.socketTimeout.hashCode() : 0);
-
- return result;
-
- }
-
- @Override
- public Long getObjectId() {
- return this.id.getValue();
- }
-
- public void setObjectId(Long id) {
- this.id.setValue(id);
- }
-
- public String getAccessKey() {
- return this.accessKey;
- }
-
- public void setAccessKey(final String accessKey) {
- this.accessKey = accessKey;
- }
-
- public String getSecretKey() {
- return this.secretKey;
- }
-
- public void setSecretKey(final String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getEndPoint() {
- return this.endPoint;
- }
-
- public void setEndPoint(final String endPoint) {
- this.endPoint = endPoint;
- }
-
-
- public String getTemplateBucketName() {
- return this.bucketName;
- }
-
- public void setTemplateBucketName(final String templateBucketName) {
- this.bucketName = templateBucketName;
- }
-
- public Integer getHttpsFlag() {
- return this.httpsFlag;
- }
-
- public void setHttpsFlag(final Integer httpsFlag) {
- this.httpsFlag = httpsFlag;
- }
-
- public Integer getConnectionTimeout() {
- return this.connectionTimeout;
- }
-
- public void setConnectionTimeout(final Integer connectionTimeout) {
- this.connectionTimeout = connectionTimeout;
- }
-
- public Integer getMaxErrorRetry() {
- return this.maxErrorRetry;
- }
-
- public void setMaxErrorRetry(final Integer maxErrorRetry) {
- this.maxErrorRetry = maxErrorRetry;
- }
-
- public Integer getSocketTimeout() {
- return this.socketTimeout;
- }
-
- public void setSocketTimeout(final Integer socketTimeout) {
- this.socketTimeout = socketTimeout;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/SSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SSHKeyPairResponse.java b/api/src/com/cloud/api/response/SSHKeyPairResponse.java
deleted file mode 100644
index c955335..0000000
--- a/api/src/com/cloud/api/response/SSHKeyPairResponse.java
+++ /dev/null
@@ -1,69 +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 SSHKeyPairResponse extends BaseResponse {
-
- @SerializedName(ApiConstants.NAME) @Param(description="Name of the keypair")
- private String name;
-
- @SerializedName("fingerprint") @Param(description="Fingerprint of the public key")
- private String fingerprint;
-
- private String privateKey;
-
- public SSHKeyPairResponse() {}
-
- public SSHKeyPairResponse(String name, String fingerprint) {
- this(name, fingerprint, null);
- }
-
- public SSHKeyPairResponse(String name, String fingerprint, String privateKey) {
- this.name = name;
- this.fingerprint = fingerprint;
- this.privateKey = privateKey;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getFingerprint() {
- return fingerprint;
- }
-
- public void setFingerprint(String fingerprint) {
- this.fingerprint = fingerprint;
- }
-
- public String getPrivateKey() {
- return privateKey;
- }
-
- public void setPrivateKey(String privateKey) {
- this.privateKey = privateKey;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/SecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SecurityGroupResponse.java b/api/src/com/cloud/api/response/SecurityGroupResponse.java
deleted file mode 100644
index 5c6deed..0000000
--- a/api/src/com/cloud/api/response/SecurityGroupResponse.java
+++ /dev/null
@@ -1,140 +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 SecurityGroupResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the security group")
- private IdentityProxy id = new IdentityProxy("security_group");
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the security group")
- private String name;
-
- @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the security group")
- private String description;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the security 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;
-
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the security group")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the security group")
- private String domainName;
-
- @SerializedName("ingressrule") @Param(description="the list of ingress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
- private List<SecurityGroupRuleResponse> ingressRules;
-
- @SerializedName("egressrule") @Param(description="the list of egress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
- private List<SecurityGroupRuleResponse> egressRules;
-
- @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 Long getId() {
- return id.getValue();
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public void setDomainId(Long domainId) {
- this.domainId.setValue(domainId);
- }
-
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
-
- public void setSecurityGroupIngressRules(List<SecurityGroupRuleResponse> securityGroupRules) {
- this.ingressRules = securityGroupRules;
- }
-
- public void setSecurityGroupEgressRules(List<SecurityGroupRuleResponse> securityGroupRules) {
- this.egressRules = securityGroupRules;
- }
-
- @Override
- public Long getObjectId() {
- return getId();
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SecurityGroupResponse other = (SecurityGroupResponse) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
-
- @Override
- public void setProjectId(Long projectId) {
- this.projectId.setValue(projectId);
- }
-
- @Override
- 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/c4c9d2d8/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java b/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
deleted file mode 100644
index f55b810..0000000
--- a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java
+++ /dev/null
@@ -1,123 +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 SecurityGroupRuleResponse extends BaseResponse {
- @SerializedName("ruleid") @Param(description="the id of the security group rule")
- private IdentityProxy ruleId = new IdentityProxy("security_group_rule");
-
- @SerializedName("protocol") @Param(description="the protocol of the security group rule")
- private String protocol;
-
- @SerializedName(ApiConstants.ICMP_TYPE) @Param(description="the type of the ICMP message response")
- private Integer icmpType;
-
- @SerializedName(ApiConstants.ICMP_CODE) @Param(description="the code for the ICMP message response")
- private Integer icmpCode;
-
- @SerializedName(ApiConstants.START_PORT) @Param(description="the starting IP of the security group rule")
- private Integer startPort;
-
- @SerializedName(ApiConstants.END_PORT) @Param(description="the ending IP of the security group rule ")
- private Integer endPort;
-
- @SerializedName(ApiConstants.SECURITY_GROUP_NAME) @Param(description="security group name")
- private String securityGroupName;
-
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="account owning the security group rule")
- private String accountName;
-
- @SerializedName(ApiConstants.CIDR) @Param(description="the CIDR notation for the base IP address of the security group rule")
- private String cidr;
-
- public Long getRuleId() {
- return ruleId.getValue();
- }
-
- public void setRuleId(Long ruleId) {
- this.ruleId.setValue(ruleId);
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public Integer getIcmpType() {
- return icmpType;
- }
-
- public void setIcmpType(Integer icmpType) {
- this.icmpType = icmpType;
- }
-
- public Integer getIcmpCode() {
- return icmpCode;
- }
-
- public void setIcmpCode(Integer icmpCode) {
- this.icmpCode = icmpCode;
- }
-
- public Integer getStartPort() {
- return startPort;
- }
-
- public void setStartPort(Integer startPort) {
- this.startPort = startPort;
- }
-
- public Integer getEndPort() {
- return endPort;
- }
-
- public void setEndPort(Integer endPort) {
- this.endPort = endPort;
- }
-
- public String getSecurityGroupName() {
- return securityGroupName;
- }
-
- public void setSecurityGroupName(String securityGroupName) {
- this.securityGroupName = securityGroupName;
- }
-
- public String getAccountName() {
- return accountName;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public String getCidr() {
- return cidr;
- }
-
- public void setCidr(String cidr) {
- this.cidr = cidr;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ServiceOfferingResponse.java b/api/src/com/cloud/api/response/ServiceOfferingResponse.java
deleted file mode 100644
index fe0efc0..0000000
--- a/api/src/com/cloud/api/response/ServiceOfferingResponse.java
+++ /dev/null
@@ -1,224 +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 ServiceOfferingResponse extends BaseResponse {
- @SerializedName("id") @Param(description="the id of the service offering")
- private IdentityProxy id = new IdentityProxy("disk_offering");
-
- @SerializedName("name") @Param(description="the name of the service offering")
- private String name;
-
- @SerializedName("displaytext") @Param(description="an alternate display text of the service offering.")
- private String displayText;
-
- @SerializedName("cpunumber") @Param(description="the number of CPU")
- private int cpuNumber;
-
- @SerializedName("cpuspeed") @Param(description="the clock rate CPU speed in Mhz")
- private int cpuSpeed;
-
- @SerializedName("memory") @Param(description="the memory in MB")
- private int memory;
-
- @SerializedName("created") @Param(description="the date this service offering was created")
- private Date created;
-
- @SerializedName("storagetype") @Param(description="the storage type for this service offering")
- private String storageType;
-
- @SerializedName("offerha") @Param(description="the ha support in the service offering")
- private Boolean offerHa;
-
- @SerializedName("limitcpuuse") @Param(description="restrict the CPU usage to committed service offering")
- private Boolean limitCpuUse;
-
- @SerializedName("tags") @Param(description="the tags for the service offering")
- private String tags;
-
- @SerializedName("domainid") @Param(description="the domain id of the service offering")
- private IdentityProxy domainId = new IdentityProxy("domain");
-
- @SerializedName(ApiConstants.DOMAIN) @Param(description="Domain name for the offering")
- private String domain;
-
- @SerializedName(ApiConstants.HOST_TAGS) @Param(description="the host tag for the service offering")
- private String hostTag;
-
- @SerializedName(ApiConstants.IS_SYSTEM_OFFERING) @Param(description="is this a system vm offering")
- private Boolean isSystem;
-
- @SerializedName(ApiConstants.IS_DEFAULT_USE) @Param(description="is this a default system vm offering")
- private Boolean defaultUse;
-
- @SerializedName(ApiConstants.SYSTEM_VM_TYPE) @Param(description="is this a the systemvm type for system vm offering")
- private String vm_type;
-
- @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
- private Integer networkRate;
-
-
- 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 Boolean getIsSystem() {
- return isSystem;
- }
-
- public void setIsSystemOffering(Boolean isSystem) {
- this.isSystem = isSystem;
- }
-
-
- public Boolean getDefaultUse() {
- return defaultUse;
- }
-
- public void setDefaultUse(Boolean defaultUse) {
- this.defaultUse = defaultUse;
- }
-
-
- public String getSystemVmType() {
- return vm_type;
- }
-
- public void setSystemVmType(String vmtype) {
- this.vm_type = vmtype;
- }
-
-
- public String getDisplayText() {
- return displayText;
- }
-
- public void setDisplayText(String displayText) {
- this.displayText = displayText;
- }
-
- public int getCpuNumber() {
- return cpuNumber;
- }
-
- public void setCpuNumber(int cpuNumber) {
- this.cpuNumber = cpuNumber;
- }
-
- public int getCpuSpeed() {
- return cpuSpeed;
- }
-
- public void setCpuSpeed(int cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public int getMemory() {
- return memory;
- }
-
- public void setMemory(int memory) {
- this.memory = memory;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public void setCreated(Date created) {
- this.created = created;
- }
-
- public String getStorageType() {
- return storageType;
- }
-
- public void setStorageType(String storageType) {
- this.storageType = storageType;
- }
-
- public Boolean getOfferHa() {
- return offerHa;
- }
-
- public void setOfferHa(Boolean offerHa) {
- this.offerHa = offerHa;
- }
-
- public Boolean getLimitCpuUse() {
- return limitCpuUse;
- }
-
- public void setLimitCpuUse(Boolean limitCpuUse) {
- this.limitCpuUse = limitCpuUse;
- }
-
- public String getTags() {
- return tags;
- }
-
- public void setTags(String tags) {
- this.tags = tags;
- }
-
- 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 getHostTag() {
- return hostTag;
- }
-
- public void setHostTag(String hostTag) {
- this.hostTag = hostTag;
- }
-
- public void setNetworkRate(Integer networkRate) {
- this.networkRate = networkRate;
- }
-}