Revert "fdfdfd"

nitinmeh · nitinmeh · commit 30ca56aff85e · 2014-08-06T18:08:01.000-07:00
This reverts commit b961dbc.
diff --git 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 void setHostName(String hostName) {
         this.hostName = hostName;
     }
 
-    public String getHypervisor() {
-        return hypervisor;
-    }
-
-    public void setHypervisor(String hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
     public void setPublicIp(String publicIp) {
         this.publicIp = publicIp;
     }
diff --git 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 void setHostName(String hostName) {
         this.hostName = hostName;
     }
 
-    public String getHypervisor() {
-        return hypervisor;
-    }
-
-    public void setHypervisor(String hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
     public String getPrivateIp() {
         return privateIp;
     }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1160,7 +1160,6 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
                 if (host != null) {
                     vmResponse.setHostId(host.getUuid());
                     vmResponse.setHostName(host.getName());
-                    vmResponse.setHypervisor(host.getHypervisorType().toString());
                 }
             }
 
diff --git 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 DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
             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();
diff --git 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.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 String getHostName() {
         return hostName;
     }
 
-    public Hypervisor.HypervisorType getHypervisorType() {
-        return hypervisorType;
-    }
-
     public Long getClusterId() {
         return clusterId;
     }

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,6 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {`
`1160`	`1160`	`if (host != null) {`
`1161`	`1161`	`vmResponse.setHostId(host.getUuid());`
`1162`	`1162`	`vmResponse.setHostName(host.getName());`
`1163`		`- vmResponse.setHypervisor(host.getHypervisorType().toString());`
`1164`	`1163`	`}`
`1165`	`1164`	`}`
`1166`	`1165`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A`
`94`	`94`	`if (router.getHostId() != null) {`
`95`	`95`	`routerResponse.setHostId(router.getHostUuid());`
`96`	`96`	`routerResponse.setHostName(router.getHostName());`
`97`		`- routerResponse.setHypervisor(router.getHypervisorType().toString());`
`98`	`97`	`}`
`99`	`98`	`routerResponse.setPodId(router.getPodUuid());`
`100`	`99`	`long nic_id = router.getNicId();`