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

bug 14156: return instancename parameter in userVm response to ROOT admin only

Browse Source
This commit is contained in:
Alena Prokharchyk 2012-03-06 13:38:27 -08:00
parent fb141dd5ef
commit f3935d667f
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/api/ApiConstants.java
View File

@ -332,6 +332,7 @@ public class ApiConstants {
public static final String CHANGE_CIDR = "changecidr"; public static final String CHANGE_CIDR = "changecidr";
public static final String PURPOSE = "purpose"; public static final String PURPOSE = "purpose";
public static final String IS_TAGGED = "istagged"; public static final String IS_TAGGED = "istagged";
public static final String INSTANCE_NAME = "instancename";
public enum HostDetails { public enum HostDetails {
all, capacity, events, stats, min; all, capacity, events, stats, min;

7
api/src/com/cloud/api/response/UserVmResponse.java
View File

@ -152,6 +152,9 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule") @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule")
private String publicIp; private String publicIp;
@SerializedName(ApiConstants.INSTANCE_NAME) @Param(description="instance name of the user vm; this parameter is returned to the ROOT admin only")
private String instanceName;
public void setHypervisor(String hypervisor) { public void setHypervisor(String hypervisor) {
this.hypervisor = hypervisor; this.hypervisor = hypervisor;
@ -335,4 +338,8 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
public void setPublicIp(String publicIp) { public void setPublicIp(String publicIp) {
this.publicIp = publicIp; this.publicIp = publicIp;
} }
public void setInstanceName(String instanceName) {
this.instanceName = instanceName;
}
} }

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

@ -1268,7 +1268,12 @@ public class ApiResponseHelper implements ResponseGenerator {
} else { } else {
userVmResponse.setDisplayName(userVm.getHostName()); userVmResponse.setDisplayName(userVm.getHostName());
} }
if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN) {
userVmResponse.setInstanceName(userVm.getInstanceName());
}
if (userVm.getPassword() != null) { if (userVm.getPassword() != null) {
userVmResponse.setPassword(userVm.getPassword()); userVmResponse.setPassword(userVm.getPassword());
} }
@ -2904,6 +2909,8 @@ public class ApiResponseHelper implements ResponseGenerator {
} else { } else {
userVmData.setDisplayName(userVm.getHostName()); userVmData.setDisplayName(userVm.getHostName());
} }
userVmData.setInstanceName(userVm.getInstanceName());
userVmData.setDomainId(userVm.getDomainId()); userVmData.setDomainId(userVm.getDomainId());
Account caller = UserContext.current().getCaller(); Account caller = UserContext.current().getCaller();
@ -2939,6 +2946,7 @@ public class ApiResponseHelper implements ResponseGenerator {
userVmResponse.setZoneId(userVmData.getZoneId()); userVmResponse.setZoneId(userVmData.getZoneId());
userVmResponse.setZoneName(userVmData.getZoneName()); userVmResponse.setZoneName(userVmData.getZoneName());
if (caller_is_admin) { if (caller_is_admin) {
userVmResponse.setInstanceName(userVmData.getInstanceName());
userVmResponse.setHostId(userVmData.getHostId()); userVmResponse.setHostId(userVmData.getHostId());
userVmResponse.setHostName(userVmData.getHostName()); userVmResponse.setHostName(userVmData.getHostName());
} }

11
server/src/com/cloud/vm/dao/UserVmData.java
View File

@ -70,6 +70,7 @@ public class UserVmData {
private long accountId; private long accountId;
private Long publicIpId; private Long publicIpId;
private String publicIp; private String publicIp;
private String instanceName;
private boolean initialized; private boolean initialized;
@ -701,6 +702,14 @@ public class UserVmData {
public void setPublicIp(String publicIp) { public void setPublicIp(String publicIp) {
this.publicIp = publicIp; this.publicIp = publicIp;
} }
public String getInstanceName() {
return instanceName;
}
public void setInstanceName(String instanceName) {
this.instanceName = instanceName;
}
} }