From e89d9e627249acec6bc281d2655b4efe0cef1fb0 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 31 Jan 2013 18:14:51 -0800 Subject: [PATCH] IPv6: Add details for domainrouter response --- .../api/response/DomainRouterResponse.java | 22 +++++++++++++++++++ .../src/com/cloud/api/ApiResponseHelper.java | 2 ++ 2 files changed, 24 insertions(+) diff --git a/api/src/com/cloud/api/response/DomainRouterResponse.java b/api/src/com/cloud/api/response/DomainRouterResponse.java index d710aadb2e7..d72162e962d 100644 --- a/api/src/com/cloud/api/response/DomainRouterResponse.java +++ b/api/src/com/cloud/api/response/DomainRouterResponse.java @@ -87,12 +87,18 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti @SerializedName("guestipaddress") @Param(description="the guest IP address for the router") private String guestIpAddress; + @SerializedName("guestip6address") @Param(description="the guest IPv6 address for the router") + private String guestIp6Address; + @SerializedName("guestmacaddress") @Param(description="the guest MAC address for the router") private String guestMacAddress; @SerializedName("guestnetmask") @Param(description="the guest netmask for the router") private String guestNetmask; + @SerializedName("guestip6cidr") @Param(description="the guest IPv6 cidr for the router") + private String guestIp6Cidr; + @SerializedName("guestnetworkid") @Param(description="the ID of the corresponding guest network") private IdentityProxy guestNetworkId = new IdentityProxy("networks"); @@ -321,4 +327,20 @@ public class DomainRouterResponse extends BaseResponse implements ControlledEnti public void setNics(List nics) { this.nics = nics; } + + public String getGuestIp6Address() { + return guestIp6Address; + } + + public void setGuestIp6Address(String guestIp6Address) { + this.guestIp6Address = guestIp6Address; + } + + public String getGuestIp6Cidr() { + return guestIp6Cidr; + } + + public void setGuestIp6Cidr(String guestIp6Cidr) { + this.guestIp6Cidr = guestIp6Cidr; + } } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index a68c7c3aee0..b61244e6227 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1763,6 +1763,8 @@ public class ApiResponseHelper implements ResponseGenerator { routerResponse.setGuestIpAddress(singleNicProfile.getIp4Address()); routerResponse.setGuestMacAddress(singleNicProfile.getMacAddress()); routerResponse.setGuestNetmask(singleNicProfile.getNetmask()); + routerResponse.setGuestIp6Address(singleNicProfile.getIp6Address()); + routerResponse.setGuestIp6Cidr(singleNicProfile.getIp6Cidr()); routerResponse.setGuestNetworkId(singleNicProfile.getNetworkId()); routerResponse.setNetworkDomain(network.getNetworkDomain()); }