Repository: cloudstack Updated Branches: refs/heads/4.4-forward b961dbc8f -> 30ca56aff
Revert "fdfdfd" This reverts commit b961dbc8f947a5cf107a14786c428710aa701cd5. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30ca56af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30ca56af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30ca56af Branch: refs/heads/4.4-forward Commit: 30ca56aff85e3d61708ec35dd49fdd34beea69f1 Parents: b961dbc Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Wed Aug 6 18:08:01 2014 -0700 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Wed Aug 6 18:08:01 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/api/response/DomainRouterResponse.java | 12 ------------ .../cloudstack/api/response/SystemVmResponse.java | 12 ------------ server/src/com/cloud/api/ApiResponseHelper.java | 1 - .../cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 - .../src/com/cloud/api/query/vo/DomainRouterJoinVO.java | 9 --------- 5 files changed, 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ca56af/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java index 9225ba0..ed16020 100644 --- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java @@ -85,10 +85,6 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView @Param(description = "the hostname for the router") private String hostName; - @SerializedName("hypervisor") - @Param(description = "the hypervisor on which the template runs") - private String hypervisor; - @SerializedName(ApiConstants.LINK_LOCAL_IP) @Param(description = "the link local IP address for the router") private String linkLocalIp; @@ -266,14 +262,6 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView this.hostName = hostName; } - public String getHypervisor() { - return hypervisor; - } - - public void setHypervisor(String hypervisor) { - this.hypervisor = hypervisor; - } - public void setPublicIp(String publicIp) { this.publicIp = publicIp; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ca56af/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java index 9e20b49..8c27c18 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -85,10 +85,6 @@ public class SystemVmResponse extends BaseResponse { @Param(description = "the hostname for the system VM") private String hostName; - @SerializedName("hypervisor") - @Param(description = "the hypervisor on which the template runs") - private String hypervisor; - @SerializedName(ApiConstants.PRIVATE_IP) @Param(description = "the private IP address for the system VM") private String privateIp; @@ -244,14 +240,6 @@ public class SystemVmResponse extends BaseResponse { this.hostName = hostName; } - public String getHypervisor() { - return hypervisor; - } - - public void setHypervisor(String hypervisor) { - this.hypervisor = hypervisor; - } - public String getPrivateIp() { return privateIp; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ca56af/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 85e2ea2..c07d454 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1160,7 +1160,6 @@ public class ApiResponseHelper implements ResponseGenerator { if (host != null) { vmResponse.setHostId(host.getUuid()); vmResponse.setHostName(host.getName()); - vmResponse.setHypervisor(host.getHypervisorType().toString()); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ca56af/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index b054b0e..9594c01 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -94,7 +94,6 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO, if (router.getHostId() != null) { routerResponse.setHostId(router.getHostUuid()); routerResponse.setHostName(router.getHostName()); - routerResponse.setHypervisor(router.getHypervisorType().toString()); } routerResponse.setPodId(router.getPodUuid()); long nic_id = router.getNicId(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ca56af/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java index b4124de..79eb3bf 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -26,7 +26,6 @@ import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.hypervisor.Hypervisor; import com.cloud.network.Network.GuestType; import com.cloud.network.Networks.TrafficType; import com.cloud.network.router.VirtualRouter; @@ -127,10 +126,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti @Column(name = "host_name", nullable = false) private String hostName; - @Column(name="hypervisor_type") - @Enumerated(value=EnumType.STRING) - private Hypervisor.HypervisorType hypervisorType; - @Column(name = "template_id", updatable = true, nullable = true, length = 17) private long templateId; @@ -343,10 +338,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti return hostName; } - public Hypervisor.HypervisorType getHypervisorType() { - return hypervisorType; - } - public Long getClusterId() { return clusterId; }
