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-6899: Added vmId in listnics response

Browse Source
This commit is contained in:
Jayapal 2014-06-12 16:50:17 +05:30
parent 93c75c73a4
commit 923c0cd89f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/org/apache/cloudstack/api/response/NicResponse.java
View File

@ -98,6 +98,14 @@ public class NicResponse extends BaseResponse {
@Param(description = "device id for the network when plugged into the virtual machine", since = "4.4") @Param(description = "device id for the network when plugged into the virtual machine", since = "4.4")
private String deviceId; private String deviceId;
@SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
@Param(description = "Id of the vm to which the nic belongs")
private String vmId;
public void setVmId(String vmId) {
this.vmId = vmId;
}
public String getId() { public String getId() {
return id; return id;
} }

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

@ -3302,9 +3302,15 @@ public class ApiResponseHelper implements ResponseGenerator {
public NicResponse createNicResponse(Nic result) { public NicResponse createNicResponse(Nic result) {
NicResponse response = new NicResponse(); NicResponse response = new NicResponse();
NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId()); NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId());
VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, result.getInstanceId());
response.setId(result.getUuid()); response.setId(result.getUuid());
response.setNetworkid(network.getUuid()); response.setNetworkid(network.getUuid());
if (vm != null) {
response.setVmId(vm.getUuid());
}
response.setIpaddress(result.getIp4Address()); response.setIpaddress(result.getIp4Address());
if (result.getSecondaryIp()) { if (result.getSecondaryIp()) {