Updated Branches: refs/heads/master b7def4342 -> 0a8343e75
CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0a8343e7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0a8343e7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0a8343e7 Branch: refs/heads/master Commit: 0a8343e750e94e494e2e408f7d151b0b20cb146e Parents: b7def43 Author: Jessica Wang <jessicaw...@apache.org> Authored: Tue Jun 18 13:52:13 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Tue Jun 18 13:54:37 2013 -0700 ---------------------------------------------------------------------- .../apache/cloudstack/api/response/ClusterResponse.java | 9 +-------- .../cloudstack/api/response/DomainRouterResponse.java | 11 ----------- .../apache/cloudstack/api/response/HostResponse.java | 9 +-------- .../org/apache/cloudstack/api/response/PodResponse.java | 9 +-------- .../cloudstack/api/response/StoragePoolResponse.java | 12 +----------- .../cloudstack/api/response/SystemVmResponse.java | 11 ----------- server/src/com/cloud/api/ApiResponseHelper.java | 3 --- .../cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 - server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java | 1 - .../com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java | 1 - .../src/com/cloud/api/query/vo/DomainRouterJoinVO.java | 12 ------------ server/src/com/cloud/api/query/vo/HostJoinVO.java | 11 ----------- .../src/com/cloud/api/query/vo/StoragePoolJoinVO.java | 11 ----------- 13 files changed, 4 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/api/src/org/apache/cloudstack/api/response/ClusterResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java index ef8cca6..68aa892 100644 --- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java @@ -45,10 +45,7 @@ public class ClusterResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the cluster") private String zoneName; - - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; - + @SerializedName("hypervisortype") @Param(description="the hypervisor type of the cluster") private String hypervisorType; @@ -118,10 +115,6 @@ public class ClusterResponse extends BaseResponse { this.zoneName = zoneName; } - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public String getClusterType() { return clusterType; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/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 852d988..1d31b58 100644 --- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java @@ -42,9 +42,6 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the router") private String zoneName; - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; - @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the router") private String dns1; @@ -188,14 +185,6 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView this.zoneName = zoneName; } - public String getZoneType() { - return zoneType; - } - - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public void setDns1(String dns1) { this.dns1 = dns1; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/api/src/org/apache/cloudstack/api/response/HostResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java index be1a4b4..687687d 100644 --- a/api/src/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java @@ -59,10 +59,7 @@ public class HostResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the host") private String zoneName; - - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; - + @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID of the host") private String podId; @@ -212,10 +209,6 @@ public class HostResponse extends BaseResponse { this.zoneName = zoneName; } - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public void setPodId(String podId) { this.podId = podId; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/api/src/org/apache/cloudstack/api/response/PodResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java index 471cac1..f31c289 100644 --- a/api/src/org/apache/cloudstack/api/response/PodResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java @@ -36,13 +36,10 @@ public class PodResponse extends BaseResponse { @SerializedName("zoneid") @Param(description="the Zone ID of the Pod") private String zoneId; - + @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the Pod") private String zoneName; - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; - @SerializedName("gateway") @Param(description="the gateway of the Pod") private String gateway; @@ -89,10 +86,6 @@ public class PodResponse extends BaseResponse { return zoneName; } - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public void setZoneName(String zoneName) { this.zoneName = zoneName; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java index 965407d..0050000 100644 --- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java @@ -37,14 +37,12 @@ public class StoragePoolResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the storage pool") private String zoneName; - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; @SerializedName("podid") @Param(description="the Pod ID of the storage pool") private String podId; @SerializedName("podname") @Param(description="the Pod name of the storage pool") - private String podName; + private String podName; @SerializedName("name") @Param(description="the name of the storage pool") private String name; @@ -143,14 +141,6 @@ public class StoragePoolResponse extends BaseResponse { this.zoneName = zoneName; } - public String getZoneType() { - return zoneType; - } - - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public String getPodId() { return podId; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/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 3439dc0..8d2798a 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -46,9 +46,6 @@ public class SystemVmResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the system VM") private String zoneName; - @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") - private String zoneType; - @SerializedName("dns1") @Param(description="the first DNS for the system VM") private String dns1; @@ -153,15 +150,7 @@ public class SystemVmResponse extends BaseResponse { public void setZoneName(String zoneName) { this.zoneName = zoneName; } - - public String getZoneType() { - return zoneType; - } - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public String getDns1() { return dns1; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/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 94c5d6c..82b08f7 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -824,7 +824,6 @@ public class ApiResponseHelper implements ResponseGenerator { if (zone != null) { podResponse.setZoneId(zone.getUuid()); podResponse.setZoneName(zone.getName()); - podResponse.setZoneType(zone.getNetworkType().toString()); } podResponse.setNetmask(NetUtils.getCidrNetmask(pod.getCidrSize())); podResponse.setStartIp(ipRange[0]); @@ -969,7 +968,6 @@ public class ApiResponseHelper implements ResponseGenerator { if (dc != null) { clusterResponse.setZoneId(dc.getUuid()); clusterResponse.setZoneName(dc.getName()); - clusterResponse.setZoneType(dc.getNetworkType().toString()); } clusterResponse.setHypervisorType(cluster.getHypervisorType().toString()); clusterResponse.setClusterType(cluster.getClusterType().toString()); @@ -1174,7 +1172,6 @@ public class ApiResponseHelper implements ResponseGenerator { if (zone != null) { vmResponse.setZoneId(zone.getUuid()); vmResponse.setZoneName(zone.getName()); - vmResponse.setZoneType(zone.getNetworkType().toString()); vmResponse.setDns1(zone.getDns1()); vmResponse.setDns2(zone.getDns2()); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/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 a7a83de..e1724d4 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -149,7 +149,6 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO, routerResponse.setDomainName(router.getDomainName()); routerResponse.setZoneName(router.getDataCenterName()); - routerResponse.setZoneType(router.getDataCenterType()); routerResponse.setDns1(router.getDns1()); routerResponse.setDns2(router.getDns2()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index c1c2839..c2d981c 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -99,7 +99,6 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements hostResponse.setOsCategoryId(host.getOsCategoryUuid()); hostResponse.setOsCategoryName(host.getOsCategoryName()); hostResponse.setZoneName(host.getZoneName()); - hostResponse.setZoneType(host.getZoneType().toString()); hostResponse.setPodName(host.getPodName()); if ( host.getClusterId() > 0) { hostResponse.setClusterName(host.getClusterName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java index f2b9525..4254a7c 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java @@ -79,7 +79,6 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo poolResponse.setIpAddress(pool.getHostAddress()); poolResponse.setZoneId(pool.getZoneUuid()); poolResponse.setZoneName(pool.getZoneName()); - poolResponse.setZoneType(pool.getZoneType()); poolResponse.setType(ObjectUtils.toString(pool.getPoolType(), null)); poolResponse.setPodId(pool.getPodUuid()); poolResponse.setPodName(pool.getPodName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/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 9e9e4a2..bfe4486 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -102,9 +102,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti @Column(name="data_center_name") private String dataCenterName = null; - @Column(name="data_center_type") - private String dataCenterType; - @Column(name="dns1") private String dns1 = null; @@ -453,15 +450,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti this.dataCenterName = zoneName; } - - public String getDataCenterType() { - return dataCenterType; - } - - public void setDataCenterType(String dataCenterType) { - this.dataCenterType = dataCenterType; - } - public Long getHostId() { return hostId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/server/src/com/cloud/api/query/vo/HostJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java index 4b70cfc..cf3cfdc 100644 --- a/server/src/com/cloud/api/query/vo/HostJoinVO.java +++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java @@ -130,9 +130,6 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity @Column(name="data_center_name") private String zoneName; - @Column(name="data_center_type") - private String zoneType; - @Column(name="pod_id") private long podId; @@ -234,15 +231,7 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity public void setZoneName(String zoneName) { this.zoneName = zoneName; } - - public String getZoneType() { - return zoneType; - } - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public String getName() { return name; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a8343e7/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java index 29e97f4..f35096a 100644 --- a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java +++ b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java @@ -99,9 +99,6 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I @Column(name="data_center_name") private String zoneName; - @Column(name="data_center_type") - private String zoneType; - @Column(name="pod_id") private long podId; @@ -301,14 +298,6 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I this.zoneName = zoneName; } - public String getZoneType() { - return zoneType; - } - - public void setZoneType(String zoneType) { - this.zoneType = zoneType; - } - public long getPodId() { return podId; }
