From c115a2e401323d3c4daee503eaff1321e7743d22 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 15 Nov 2010 14:55:03 -0800 Subject: [PATCH] bug 7189: returning vmdisplayname if available for all port fwding crud cmds status 7189: resolved fixed --- server/src/com/cloud/api/ApiResponseHelper.java | 1 + .../com/cloud/api/response/FirewallRuleResponse.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index dfd6962e7d3..a91129ffe6a 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1004,6 +1004,7 @@ public class ApiResponseHelper { UserVm vm = ApiDBUtils.findUserVmByPublicIpAndGuestIp(fwRule.getPublicIpAddress(), fwRule.getPrivateIpAddress()); response.setVirtualMachineId(vm.getId()); response.setVirtualMachineName(vm.getHostName()); + response.setVirtualMachineDisplayName(vm.getDisplayName()); } response.setObjectName("portforwardingrule"); return response; diff --git a/server/src/com/cloud/api/response/FirewallRuleResponse.java b/server/src/com/cloud/api/response/FirewallRuleResponse.java index 97ca8c9523f..0e94a2e1b27 100644 --- a/server/src/com/cloud/api/response/FirewallRuleResponse.java +++ b/server/src/com/cloud/api/response/FirewallRuleResponse.java @@ -40,6 +40,9 @@ public class FirewallRuleResponse extends BaseResponse { @SerializedName("vmname") @Param(description="the VM name for the port forwarding rule") private String virtualMachineName; + @SerializedName("vmdisplayname") @Param(description="the VM display name for the port forwarding rule") + private String virtualMachineDisplayName; + public Long getId() { return id; } @@ -87,4 +90,12 @@ public class FirewallRuleResponse extends BaseResponse { public void setVirtualMachineName(String virtualMachineName) { this.virtualMachineName = virtualMachineName; } + + public String getVirtualMachineDisplayName() { + return virtualMachineDisplayName; + } + + public void setVirtualMachineDisplayName(String virtualMachineDisplayName) { + this.virtualMachineDisplayName = virtualMachineDisplayName; + } }