etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3016: remove zonetype property from API response (userVM)

This commit is contained in:
Jessica Wang 2013-06-18 14:55:56 -07:00
parent 759eeca651
commit 2f2bb6b316
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/org/apache/cloudstack/api/response/UserVmResponse.java
View File

@ -80,9 +80,6 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
private String zoneName;
@SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the network type of the availability zone for the virtual machine")
private String zoneType;
@SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine")
private String hostId;
@ -273,10 +270,6 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
this.zoneName = zoneName;
}
public void setZoneType(String zoneType) {
this.zoneType = zoneType;
}
public void setHostId(String hostId) {
this.hostId = hostId;
}

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

@ -102,7 +102,6 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
}
userVmResponse.setZoneId(userVm.getDataCenterUuid());
userVmResponse.setZoneName(userVm.getDataCenterName());
userVmResponse.setZoneType(userVm.getDataCenterType());
if ((caller == null) || (caller.getType() == Account.ACCOUNT_TYPE_ADMIN)) {
userVmResponse.setInstanceName(userVm.getInstanceName());
userVmResponse.setHostId(userVm.getHostUuid());

13
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
View File

@ -156,9 +156,6 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
@Column(name="data_center_name")
private String dataCenterName = null;
@Column(name="data_center_type")
private String dataCenterType = null;
@Column(name="security_group_enabled")
private boolean securityGroupEnabled;
@ -813,18 +810,8 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
public void setDataCenterName(String zoneName) {
this.dataCenterName = zoneName;
}
public String getDataCenterType() {
return dataCenterType;
}
public void setDataCenterType(String zoneType) {
this.dataCenterType = zoneType;
}
public boolean isSecurityGroupEnabled() {
return securityGroupEnabled;
}