From 5c8619903b3ba3f9951866b01cd9369e1396d849 Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 30 Nov 2010 10:14:44 -0800 Subject: [PATCH] bug 7342: return ipaddress instead of publicip in listIpForwardingRules/listPortForwardingRules api responses. status 7342: resolved fixed --- api/src/com/cloud/api/response/FirewallRuleResponse.java | 2 +- api/src/com/cloud/api/response/IpForwardingRuleResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/api/response/FirewallRuleResponse.java b/api/src/com/cloud/api/response/FirewallRuleResponse.java index 1c98d3d5d90..96e02f12976 100644 --- a/api/src/com/cloud/api/response/FirewallRuleResponse.java +++ b/api/src/com/cloud/api/response/FirewallRuleResponse.java @@ -43,7 +43,7 @@ public class FirewallRuleResponse extends BaseResponse { @SerializedName("virtualmachinedisplayname") @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") + @SerializedName("ipaddress") @Param(description="the public ip address for the port forwarding rule") private String publicIpAddress; public Long getId() { diff --git a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java b/api/src/com/cloud/api/response/IpForwardingRuleResponse.java index 648562b219a..45aaa6e0e4d 100644 --- a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java +++ b/api/src/com/cloud/api/response/IpForwardingRuleResponse.java @@ -43,7 +43,7 @@ public class IpForwardingRuleResponse extends BaseResponse { @SerializedName("virtualmachinedisplayname") @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") + @SerializedName("ipaddress") @Param(description="the public ip address for the port forwarding rule") private String publicIpAddress; public Long getId() {