http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4b75132a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java index a5913cf..c6c7c4b 100644 --- a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java @@ -17,7 +17,6 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.response.NetworkDeviceResponse; @@ -25,122 +24,122 @@ import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class ExternalFirewallResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the external firewall") - private IdentityProxy id = new IdentityProxy("host"); - + private String id; + @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of the external firewall") - private IdentityProxy zoneId = new IdentityProxy("data_center"); - + private String zoneId; + @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external firewall") private String ipAddress; - + @SerializedName(ApiConstants.USERNAME) @Param(description="the username that's used to log in to the external firewall") private String username; - + @SerializedName(ApiConstants.PUBLIC_INTERFACE) @Param(description="the public interface of the external firewall") private String publicInterface; - + @SerializedName(ApiConstants.USAGE_INTERFACE) @Param(description="the usage interface of the external firewall") private String usageInterface; - + @SerializedName(ApiConstants.PRIVATE_INTERFACE) @Param(description="the private interface of the external firewall") private String privateInterface; - + @SerializedName(ApiConstants.PUBLIC_ZONE) @Param(description="the public security zone of the external firewall") private String publicZone; - + @SerializedName(ApiConstants.PRIVATE_ZONE) @Param(description="the private security zone of the external firewall") private String privateZone; - + @SerializedName(ApiConstants.NUM_RETRIES) @Param(description="the number of times to retry requests to the external firewall") private String numRetries; - + @SerializedName(ApiConstants.TIMEOUT) @Param(description="the timeout (in seconds) for requests to the external firewall") private String timeout; - - public Long getId() { - return id.getValue(); + + public String getId() { + return id; } - - public void setId(Long id) { - this.id.setValue(id); + + public void setId(String id) { + this.id = id; } - - public Long getZoneId() { - return zoneId.getValue(); + + public String getZoneId() { + return zoneId; } - - public void setZoneId(Long zoneId) { - this.zoneId.setValue(zoneId); + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; } - + public String getIpAddress() { return ipAddress; } - + public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } - + public String getUsername() { return username; } - + public void setUsername(String username) { this.username = username; } - + public String getPublicInterface() { return publicInterface; } - + public void setPublicInterface(String publicInterface) { this.publicInterface = publicInterface; } - + public String getUsageInterface() { return usageInterface; } - + public void setUsageInterface(String usageInterface) { this.usageInterface = usageInterface; } - + public String getPrivateInterface() { return privateInterface; } - + public void setPrivateInterface(String privateInterface) { this.privateInterface = privateInterface; } - + public String getPublicZone() { return publicZone; } - + public void setPublicZone(String publicZone) { this.publicZone = publicZone; } - + public String getPrivateZone() { return privateZone; } - + public void setPrivateZone(String privateZone) { this.privateZone = privateZone; } - + public String getNumRetries() { return numRetries; } - + public void setNumRetries(String numRetries) { this.numRetries = numRetries; } - + public String getTimeout() { return timeout; } - + public void setTimeout(String timeout) { this.timeout = timeout; }
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4b75132a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java index c5dfa5a..ccda410 100644 --- a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java @@ -17,7 +17,6 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.response.NetworkDeviceResponse; @@ -25,78 +24,78 @@ import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class ExternalLoadBalancerResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the external load balancer") - private IdentityProxy id = new IdentityProxy("host"); - + private String id; + @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of the external load balancer") - private IdentityProxy zoneId = new IdentityProxy("data_center"); - + private String zoneId; + @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external load balancer") private String ipAddress; - + @SerializedName(ApiConstants.USERNAME) @Param(description="the username that's used to log in to the external load balancer") private String username; - + @SerializedName(ApiConstants.PUBLIC_INTERFACE) @Param(description="the public interface of the external load balancer") private String publicInterface; - + @SerializedName(ApiConstants.PRIVATE_INTERFACE) @Param(description="the private interface of the external load balancer") private String privateInterface; - + @SerializedName(ApiConstants.NUM_RETRIES) @Param(description="the number of times to retry requests to the external load balancer") private String numRetries; - - public Long getId() { - return id.getValue(); + + public String getId() { + return id; } - - public void setId(Long id) { - this.id.setValue(id); + + public void setId(String id) { + this.id = id; } - - public Long getZoneId() { - return zoneId.getValue(); + + public String getZoneId() { + return zoneId; } - - public void setZoneId(Long zoneId) { - this.zoneId.setValue(zoneId); + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; } - + public String getIpAddress() { return ipAddress; } - + public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } - + public String getUsername() { return username; } - + public void setUsername(String username) { this.username = username; } - + public String getPublicInterface() { return publicInterface; } - + public void setPublicInterface(String publicInterface) { this.publicInterface = publicInterface; } - + public String getPrivateInterface() { return privateInterface; } - + public void setPrivateInterface(String privateInterface) { this.privateInterface = privateInterface; } - + public String getNumRetries() { return numRetries; } - + public void setNumRetries(String numRetries) { this.numRetries = numRetries; }
