apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM)

Browse Source
This commit is contained in:
Jessica Wang 2013-06-18 13:52:13 -07:00
parent b7def43427
commit 0a8343e750
13 changed files with 4 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/org/apache/cloudstack/api/response/ClusterResponse.java
View File

@ -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;
}

11
api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
View File

@ -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;
}

9
api/src/org/apache/cloudstack/api/response/HostResponse.java
View File

@ -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;
}

9
api/src/org/apache/cloudstack/api/response/PodResponse.java
View File

@ -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;
}

12
api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
View File

@ -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;
}

11
api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
View File

@ -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;
}

3
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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());
}

1
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
View File

@ -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());

1
server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java
View File

@ -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());

1
server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
View File

@ -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());

12
server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
View File

@ -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;

11
server/src/com/cloud/api/query/vo/HostJoinVO.java
View File

@ -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;
}

11
server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
View File

@ -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;
}