diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 6e5f4d99f99..f33545255cc 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1002,6 +1002,7 @@ public class ApiResponseHelper { response.setPrivatePort(fwRule.getPrivatePort()); response.setProtocol(fwRule.getProtocol()); response.setPublicPort(fwRule.getPublicPort()); + response.setPublicIpAddress(fwRule.getPublicIpAddress()); if (fwRule.getPublicIpAddress() != null && fwRule.getPrivateIpAddress() != null) { UserVm vm = ApiDBUtils.findUserVmByPublicIpAndGuestIp(fwRule.getPublicIpAddress(), fwRule.getPrivateIpAddress()); response.setVirtualMachineId(vm.getId()); diff --git a/server/src/com/cloud/api/response/FirewallRuleResponse.java b/server/src/com/cloud/api/response/FirewallRuleResponse.java index 0e94a2e1b27..d945f2eefed 100644 --- a/server/src/com/cloud/api/response/FirewallRuleResponse.java +++ b/server/src/com/cloud/api/response/FirewallRuleResponse.java @@ -43,6 +43,9 @@ public class FirewallRuleResponse extends BaseResponse { @SerializedName("vmdisplayname") @Param(description="the VM display name for the port forwarding rule") private String virtualMachineDisplayName; + @SerializedName("publicipaddress") @Param(description="the public ip address for the port forwarding rule") + private String publicIpAddress; + public Long getId() { return id; } @@ -98,4 +101,12 @@ public class FirewallRuleResponse extends BaseResponse { public void setVirtualMachineDisplayName(String virtualMachineDisplayName) { this.virtualMachineDisplayName = virtualMachineDisplayName; } + + public String getPublicIpAddress() { + return publicIpAddress; + } + + public void setPublicIpAddress(String publicIpAddress) { + this.publicIpAddress = publicIpAddress; + } }