apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

LOUDSTACK-2120: mixed zone management - extend listVirtualMachines API to return zone type.

Browse Source
This commit is contained in:
Jessica Wang 2013-04-20 18:42:18 -07:00
parent 060be0876f
commit 612e5fb672
6 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/org/apache/cloudstack/api/ApiConstants.java
View File

@ -231,6 +231,7 @@ public class ApiConstants {
public static final String VOLUME_ID = "volumeid";
public static final String ZONE_ID = "zoneid";
public static final String ZONE_NAME = "zonename";
public static final String ZONE_TYPE = "zonetype";
public static final String NETWORK_TYPE = "networktype";
public static final String PAGE = "page";
public static final String PAGE_SIZE = "pagesize";

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

@ -80,6 +80,9 @@ 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;
@ -249,6 +252,10 @@ 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

@ -101,6 +101,7 @@ 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

@ -153,6 +153,9 @@ 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;
@ -800,8 +803,18 @@ 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;
}

2
setup/db/db/schema-40to410.sql
View File

@ -487,6 +487,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
data_center.id data_center_id,
data_center.uuid data_center_uuid,
data_center.name data_center_name,
data_center.networktype data_center_type,
data_center.is_security_group_enabled security_group_enabled,
host.id host_id,
host.uuid host_uuid,
@ -1456,6 +1457,7 @@ CREATE VIEW `cloud`.`storage_pool_view` AS
data_center.id data_center_id,
data_center.uuid data_center_uuid,
data_center.name data_center_name,
data_center.name data_center_type,
host_pod_ref.id pod_id,
host_pod_ref.uuid pod_uuid,
host_pod_ref.name pod_name,

1
setup/db/db/schema-410to420.sql
View File

@ -374,6 +374,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
data_center.id data_center_id,
data_center.uuid data_center_uuid,
data_center.name data_center_name,
data_center.networktype data_center_type,
data_center.is_security_group_enabled security_group_enabled,
host.id host_id,
host.uuid host_uuid,